Lewis Cawte has uploaded a new change for review. https://gerrit.wikimedia.org/r/168913
Change subject: Use Config for a few globals. ...................................................................... Use Config for a few globals. Change-Id: I1790bbbb3c77d680a3d908a850557c4879a5e366 --- M Bouquet.skin.php 1 file changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet refs/changes/13/168913/1 diff --git a/Bouquet.skin.php b/Bouquet.skin.php index 014da98..2b47142 100644 --- a/Bouquet.skin.php +++ b/Bouquet.skin.php @@ -55,8 +55,9 @@ * @return String: logo image URL */ private function getLogo() { - global $wgStylePath, $wgDefaultTheme; + global $wgStylePath; + $defaultTheme = $this->config->get( 'DefaultTheme' ); $logoURL = ''; $customLogo = wfFindFile( 'Bouquet-skin-logo.png' ); @@ -72,8 +73,8 @@ $themeFromRequest = $this->getSkin()->getRequest()->getVal( 'usetheme', false ); if ( $themeFromRequest ) { $themeName = $themeFromRequest; - } elseif ( isset( $wgDefaultTheme ) && $wgDefaultTheme != 'default' ) { - $themeName = $wgDefaultTheme; + } elseif ( isset( $defaultTheme ) && $defaultTheme != 'default' ) { + $themeName = $defaultTheme; } else { $themeName = false; } @@ -101,7 +102,6 @@ * outputs a formatted page. */ public function execute() { - global $wgSitename; $this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); @@ -112,13 +112,13 @@ <?php echo Html::element( 'a', array( 'href' => $this->data['nav_urls']['mainpage']['href'], 'class' => 'header-link', - 'title' => $wgSitename, + 'title' => $this->config->get( 'Sitename' ), 'rel' => 'home' ) + Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ); ?> <div> <h1 class="firstHeading" id="site-title"><span dir="auto"><?php echo Html::element( 'a', array( 'href' => $this->data['nav_urls']['mainpage']['href'] ) - + Linker::tooltipAndAccesskeyAttribs( 'p-logo' ), $wgSitename ); ?></span></h1> + + Linker::tooltipAndAccesskeyAttribs( 'p-logo' ), $this->config->get( 'Sitename' ) ); ?></span></h1> <h2 id="site-description"><?php $this->msg( 'tagline' ) ?></h2> </div> </header><!-- #branding --> @@ -313,7 +313,6 @@ } function searchBox() { - global $wgUseTwoButtonsSearchForm; ?> <aside id="search-3" class="widget widget_search"> <form role="search" method="get" id="searchform" class="searchform" action="<?php $this->text( 'wgScript' ) ?>"> @@ -323,7 +322,7 @@ <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); - if ( $wgUseTwoButtonsSearchForm ) { + if ( $this->config->get( 'UseTwoButtonsSearchForm' ) ) { echo ' '; echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); } else { ?> -- To view, visit https://gerrit.wikimedia.org/r/168913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1790bbbb3c77d680a3d908a850557c4879a5e366 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Bouquet Gerrit-Branch: master Gerrit-Owner: Lewis Cawte <le...@lewiscawte.me> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits