diff options
Diffstat (limited to 'app/Theme')
| -rw-r--r-- | app/Theme/AdministrationTheme.php | 2 | ||||
| -rw-r--r-- | app/Theme/BaseTheme.php | 13 | ||||
| -rw-r--r-- | app/Theme/ColorsTheme.php | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/Theme/AdministrationTheme.php b/app/Theme/AdministrationTheme.php index ea3823e144..5eddaa8b2d 100644 --- a/app/Theme/AdministrationTheme.php +++ b/app/Theme/AdministrationTheme.php @@ -212,7 +212,7 @@ class AdministrationTheme extends BaseTheme { /** {@inheritdoc} */ protected function secondaryMenuContent(array $menus) { - return implode('', array_map(function ($menu) { return $menu->bootstrap(); }, $menus)); + return implode('', array_map(function (Menu $menu) { return $menu->bootstrap(); }, $menus)); } /** {@inheritdoc} */ diff --git a/app/Theme/BaseTheme.php b/app/Theme/BaseTheme.php index 1d5f4ec78a..d9e6785b5d 100644 --- a/app/Theme/BaseTheme.php +++ b/app/Theme/BaseTheme.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Database; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Filter; use Fisharebest\Webtrees\FlashMessages; +use Fisharebest\Webtrees\Functions\Functions; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\GedcomTag; use Fisharebest\Webtrees\HitCounter; @@ -253,7 +254,7 @@ abstract class BaseTheme { case 'mailto': return '<a href="mailto:' . Filter::escapeHtml($user->getEmail()) . '">' . $user->getRealNameHtml() . '</a>'; default: - return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(get_query_url()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>'; + return "<a href='#' onclick='message(\"" . Filter::escapeHtml($user->getUserName()) . "\", \"" . $method . "\", \"" . WT_BASE_URL . Filter::escapeHtml(Functions::getQueryUrl()) . "\", \"\");return false;'>" . $user->getRealNameHtml() . '</a>'; } } @@ -1355,7 +1356,7 @@ abstract class BaseTheme { $language_tag = $locale->languageTag(); $menu->addSubmenu(new Menu( $locale->endonym(), - get_query_url(array('lang' => $language_tag), '&'), + Functions::getQueryUrl(array('lang' => $language_tag), '&'), 'menu-language-' . $language_tag . (WT_LOCALE === $language_tag ? ' active' : '') )); } @@ -1509,7 +1510,7 @@ abstract class BaseTheme { if (Auth::check() || Auth::isSearchEngine() || WT_SCRIPT_NAME === 'login.php') { return null; } else { - return new Menu(I18N::translate('Login'), WT_LOGIN_URL . '?url=' . rawurlencode(get_query_url())); + return new Menu(I18N::translate('Login'), WT_LOGIN_URL . '?url=' . rawurlencode(Functions::getQueryUrl())); } } @@ -1695,7 +1696,7 @@ abstract class BaseTheme { foreach (Theme::installedThemes() as $theme) { $submenu = new Menu( $theme->themeName(), - get_query_url(array('theme' => $theme->themeId()), '&'), + Functions::getQueryUrl(array('theme' => $theme->themeId()), '&'), 'menu-theme-' . $theme->themeId() . ($theme === $this ? ' active' : '') ); $submenus[] = $submenu; @@ -1957,7 +1958,7 @@ abstract class BaseTheme { * @return string */ protected function primaryMenuContent(array $menus) { - return implode('', array_map(function ($menu) { return $menu->getMenuAsList(); }, $menus)); + return implode('', array_map(function (Menu $menu) { return $menu->getMenuAsList(); }, $menus)); } /** @@ -1996,7 +1997,7 @@ abstract class BaseTheme { * @return string */ protected function secondaryMenuContent(array $menus) { - return implode('', array_map(function ($menu) { return $menu->getMenuAsList(); }, $menus)); + return implode('', array_map(function (Menu $menu) { return $menu->getMenuAsList(); }, $menus)); } /** diff --git a/app/Theme/ColorsTheme.php b/app/Theme/ColorsTheme.php index 0c04b80a4e..2d081bd537 100644 --- a/app/Theme/ColorsTheme.php +++ b/app/Theme/ColorsTheme.php @@ -16,6 +16,7 @@ namespace Fisharebest\Webtrees\Theme; * along with this program. If not, see <http://www.gnu.org/licenses/>. */ use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Functions\Functions; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Menu; use Fisharebest\Webtrees\Session; @@ -138,7 +139,7 @@ class ColorsTheme extends CloudsTheme { foreach ($this->palettes as $palette_id => $palette_name) { $menu->addSubmenu(new Menu( $palette_name, - get_query_url(array('themecolor' => $palette_id), '&'), + Functions::getQueryUrl(array('themecolor' => $palette_id), '&'), 'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : '') )); } |