Core changes for r55234: generalize some CSS for mwsuggest

[lhc/web/wiklou.git] / skins / MonoBook.php

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 195c404..175bca0 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -20,13 +20,9 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinMonoBook extends SkinTemplate {
        /** Using monobook. */
-       function initPage( OutputPage $out ) {
-               parent::initPage( $out );
-               $this->skinname  = 'monobook';
-               $this->stylename = 'monobook';
-               $this->template  = 'MonoBookTemplate';
+       var $skinname = 'monobook', $stylename = 'monobook',
+               $template = 'MonoBookTemplate';
 
-       }
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
 
@@ -48,10 +44,10 @@ class SkinMonoBook extends SkinTemplate {
 
 
                //@@todo we can move this to the parent once we update all skins
-               if( isset($this->pagecss) )
+               if( isset( $this->pagecss ) &&  $this->pagecss)
                        $out->addInlineStyle( $this->pagecss );
 
-               if(  isset($this->usercss) )
+               if( isset( $this->usercss ) &&  $this->usercss)
                        $out->addInlineStyle( $this->usercss );
 
        }
@@ -60,13 +56,13 @@ class SkinMonoBook extends SkinTemplate {
                $out->addScriptFile( 'wikibits.js' );
 
                //@@todo can move to parent once we update all skins (to not include things twice
-               if(  isset($this->jsvarurl) )
+               if( isset( $this->jsvarurl ) && $this->jsvarurl)
                        $out->addScriptFile( $this->jsvarurl );
 
-               if(  isset($this->userjs) )
+               if( isset( $this->userjs ) && $this->userjs)
                        $out->addScriptFile( $this->userjs );
 
-               if(  isset($this->userjsprev) )
+               if( isset( $this->userjsprev ) && $this->userjsprev)
                        $out->addInlineScript( $this->userjsprev );
        }
 }
@@ -249,17 +245,17 @@ HTML
        <div id="p-search" class="portlet">
                <h5 <?php $this->html('userlangattributes') ?>><label for="searchInput"><?php $this->msg('search') ?></label></h5>
                <div id="searchBody" class="pBody">
-                       <form action="<?php $this->text('wgScript') ?>" id="searchform"><div>
+                       <form action="<?php $this->text('wgScript') ?>" id="searchform">
                                <input type='hidden' name="title" value="<?php $this->text('searchtitle') ?>"/>
                                <input id="searchInput" name="search" type="text"<?php echo $this->skin->tooltipAndAccesskey('search');
-                                       if( isset( $this->data['search'] ) ) {
+                                       if( isset( $this->data['search'] ) &&  $this->data['search'] ) {
                                                ?> value="<?php $this->text('search') ?>"<?php } ?> />
                                <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> /><?php if ($wgUseTwoButtonsSearchForm) { ?>&nbsp;
                                <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> /><?php } else { ?>
 
                                <div><a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a></div><?php } ?>
 
-                       </div></form>
+                       </form>
                </div>
        </div>
 <?php
@@ -273,23 +269,23 @@ HTML
                <div class="pBody">
                        <ul>
 <?php
-               if( isset($this->data['notspecialpage']) ) { ?>
+               if($this->data['notspecialpage']) { ?>
                                <li id="t-whatlinkshere"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href'])
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-whatlinkshere') ?>><?php $this->msg('whatlinkshere') ?></a></li>
 <?php
-                       if(  isset($this->data['nav_urls']['recentchangeslinked']) ) { ?>
+                       if( $this->data['nav_urls']['recentchangeslinked'] ) { ?>
                                <li id="t-recentchangeslinked"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href'])
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked-toolbox') ?></a></li>
 <?php          }
                }
-               if( isset($this->data['nav_urls']['trackbacklink'])) { ?>
+               if( isset( $this->data['nav_urls']['trackbacklink'] ) && $this->data['nav_urls']['trackbacklink'] ) { ?>
                        <li id="t-trackbacklink"><a href="<?php
                                echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-trackbacklink') ?>><?php $this->msg('trackbacklink') ?></a></li>
 <?php  }
-               if(  isset($this->data['feeds']) ) { ?>
+               if($this->data['feeds']) { ?>
                        <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
                                        ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
                                        echo htmlspecialchars($feed['href']) ?>" rel="alternate" type="application/<?php echo $key ?>+xml" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
@@ -298,7 +294,7 @@ HTML
 
                foreach( array('contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
 
-                       if(  isset( $this->data['nav_urls'][$special]) ) {
+                       if($this->data['nav_urls'][$special]) {
                                ?><li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
                                ?>"<?php echo $this->skin->tooltipAndAccesskey('t-'.$special) ?>><?php $this->msg($special) ?></a></li>
 <?php          }
@@ -327,7 +323,7 @@ HTML
 
        /*************************************************************************************************/
        function languageBox() {
-               if(  isset( $this->data['language_urls']) ) {
+               if( $this->data['language_urls'] ) {
 ?>
        <div id="p-lang" class="portlet">
                <h5 <?php $this->html('userlangattributes') ?>><?php $this->msg('otherlanguages') ?></h5>