Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/168912

Change subject: Use Config instead of globals
......................................................................

Use Config instead of globals

Change-Id: If6eac180316ef626e319fbd39988259dfcaffe16
---
M Truglass.skin.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass 
refs/changes/12/168912/1

diff --git a/Truglass.skin.php b/Truglass.skin.php
index 460b650..31f9984 100644
--- a/Truglass.skin.php
+++ b/Truglass.skin.php
@@ -263,7 +263,7 @@
                                                        <form name="searchform" 
action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
                                                                <input 
type="hidden" name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
                                                                <input 
type="hidden" name="fulltext" class="searchButton" value="<?php $this->msg( 
'search' ) ?>" />
-                                                               <img src="<?php 
$this->text( 'stylepath' ) ?>/Truglass/<?php $this->text( 'stylename' ) 
?>/searchleftcap<?php if( $wgLang->isRTL() ) echo '_rtl'; ?>.gif" alt="" 
width="17" height="19" border="0" id="s1" class="srchimgs" />
+                                                               <img src="<?php 
$this->text( 'stylepath' ) ?>/Truglass/<?php $this->text( 'stylename' ) 
?>/searchleftcap<?php if( RequestContext::getMain()->getLanguage()->is) echo 
'_rtl'; ?>.gif" alt="" width="17" height="19" border="0" id="s1" 
class="srchimgs" />
                                                                <input 
type="text" name="search" class="sbox" id="q01" <?php if( $this->haveMsg( 
'accesskey-search' ) ) { ?>accesskey="<?php $this->msg( 'accesskey-search' ) 
?>"<?php } if( isset( $this->data['search'] ) ) { ?> value="<?php $this->text( 
'search' ) ?>"<?php } ?> />
                                                                <img src="<?php 
$this->text( 'stylepath' ) ?>/Truglass/<?php $this->text( 'stylename' ) 
?>/searchrightcap<?php if( $wgLang->isRTL() ) echo '_rtl'; ?>.gif" alt="" 
width="9" height="19" border="0" id="s2" class="srchimgs" />
                                                        </form>
@@ -340,9 +340,9 @@
         * an array.
         */
        function networkNavigationBox() {
-               global $wgTruglassSidebarLinks;
+               $sidebarLinks = $this->config->get( 'TruglassSidebarLinks' );
 
-               if( is_array( $wgTruglassSidebarLinks ) && !empty( 
$wgTruglassSidebarLinks ) ) {
+               if( is_array( $sidebarLinks ) && !empty( $sidebarLinks ) ) {
 ?>
                                        <div class="sbmodule" 
id="sbm-networknav">
                                                <h4 class="sbmoduletitle 
displayer"><?php echo wfMessage( 'truglass-links' )->parse() ?></h4>
@@ -350,7 +350,7 @@
                                                        <div class="stretcher">
                                                                <ul>
                                                                        <?php
-                                                                       foreach 
( $wgTruglassSidebarLinks as $link => $title ) {
+                                                                       foreach 
( $sidebarLinks as $link => $title ) {
                                                                                
echo '<li><a href="http://' . $link . '/">' . $title . '</a></li>';
                                                                        }
                                                                        ?>

-- 
To view, visit https://gerrit.wikimedia.org/r/168912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6eac180316ef626e319fbd39988259dfcaffe16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
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

Reply via email to