Revert r89123 -- caused bug 30259 (switched correct calls with incorrect calls becaus...

diff --git a/skins/Chick.php b/skins/Chick.php
index b8b9f34..b7cef69 100644 (file)
--- a/skins/Chick.php
+++ b/skins/Chick.php
@@ -21,9 +21,6 @@ class SkinChick extends SkinTemplate {
        var $skinname = 'chick', $stylename = 'chick',
        $template = 'MonoBookTemplate', $useHeadElement = true;
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
 

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 808ed37..687efa2 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -19,9 +19,6 @@ class SkinCologneBlue extends SkinLegacy {
        var $skinname = 'cologneblue', $stylename = 'cologneblue',
                $template = 'CologneBlueTemplate';
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.cologneblue' );
@@ -54,9 +51,6 @@ class SkinCologneBlue extends SkinLegacy {
 
 class CologneBlueTemplate extends LegacyTemplate {
 
-       /**
-        * @return string
-        */
        function doBeforeContent() {
                $mainPageObj = Title::newMainPage();
 
@@ -97,9 +91,6 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @return string
-        */
        function doAfterContent(){
                global $wgLang;
 
@@ -141,9 +132,6 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @return string
-        */
        function sysLinks() {
                global $wgUser, $wgLang;
                $li = SpecialPage::getTitleFor( 'Userlogin' );
@@ -202,8 +190,6 @@ class CologneBlueTemplate extends LegacyTemplate {
        /**
         * Compute the sidebar
         * @access private
-        *
-        * @return string
         */
        function quickBar(){
                global $wgOut, $wgUser;
@@ -359,19 +345,11 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @param $key string
-        * @return string
-        */
        function menuHead( $key ) {
                $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
                return $s;
        }
 
-       /**
-        * @param $label string
-        * @return string
-        */
        function searchForm( $label = '' ) {
                global $wgRequest, $wgUseTwoButtonsSearchForm;
 

diff --git a/skins/Modern.php b/skins/Modern.php
index 02e3b0a..f82ea09 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -21,9 +21,6 @@ class SkinModern extends SkinTemplate {
        var $skinname = 'modern', $stylename = 'modern',
                $template = 'ModernTemplate', $useHeadElement = true;
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles ('skins.modern');

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index ab72506..c8afa90 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -23,9 +23,6 @@ class SkinMonoBook extends SkinTemplate {
        var $skinname = 'monobook', $stylename = 'monobook',
                $template = 'MonoBookTemplate', $useHeadElement = true;
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
                parent::setupSkinUserCss( $out );
@@ -219,8 +216,6 @@ echo $footerEnd;
        /**
         * Prints the cactions bar.
         * Shared between MonoBook and Modern
-        *
-        * @param $skin Skin
         */
        function cactions() {
 ?>

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index c23e289..a4fd985 100644 (file)
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -18,9 +18,6 @@ class SkinNostalgia extends SkinLegacy {
        var $skinname = 'nostalgia', $stylename = 'nostalgia',
                $template = 'NostalgiaTemplate';
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.nostalgia' );
@@ -30,9 +27,6 @@ class SkinNostalgia extends SkinLegacy {
 
 class NostalgiaTemplate extends LegacyTemplate {
 
-       /**
-        * @return string
-        */
        function doBeforeContent() {
                $s = "\n<div id='content'>\n<div id='top'>\n";
                $s .= '<div id="logo">' . $this->getSkin()->logoText( 'right' ) . '</div>';
@@ -65,9 +59,6 @@ class NostalgiaTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @return string
-        */
        function topLinks() {
                global $wgOut, $wgUser;
                $sep = " |\n";
@@ -114,9 +105,6 @@ class NostalgiaTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @return string
-        */
        function doAfterContent() {
                $s = "\n</div><br clear='all' />\n";
 

diff --git a/skins/Simple.php b/skins/Simple.php
index 0644377..87bb0b7 100644 (file)
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -21,9 +21,6 @@ class SkinSimple extends SkinTemplate {
        var $skinname = 'simple', $stylename = 'simple',
                $template = 'MonoBookTemplate', $useHeadElement = true;
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ) {
                parent::setupSkinUserCss( $out );
 

diff --git a/skins/Standard.php b/skins/Standard.php
index 322f7b2..27910f0 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -18,9 +18,6 @@ class SkinStandard extends SkinLegacy {
        var $skinname = 'standard', $stylename = 'standard',
                $template = 'StandardTemplate';
 
-       /**
-        * @param $out OutputPage
-        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.standard' );
@@ -50,9 +47,6 @@ class SkinStandard extends SkinLegacy {
 
 class StandardTemplate extends LegacyTemplate {
 
-       /**
-        * @return string
-        */
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -101,9 +95,6 @@ class StandardTemplate extends LegacyTemplate {
                return $s;
        }
 
-       /**
-        * @return string
-        */
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
 

diff --git a/skins/Vector.php b/skins/Vector.php
index e0d87a8..ac65b1f 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -108,7 +108,7 @@ class VectorTemplate extends BaseTemplate {
                                }
                                if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
                                        $nav[$section][$key]['key'] =
-                                               Linker::titleAttrib( $xmlID );
+                                               Linker::tooltip( $xmlID );
                                } else {
                                        $nav[$section][$key]['key'] =
                                                Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
@@ -302,7 +302,7 @@ class VectorTemplate extends BaseTemplate {
                        $msg = $name;
                }
                ?>
-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::titleAttrib( 'p-' . $name ) ?>>
+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
        <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5>
        <div class="body">
 <?php
@@ -332,8 +332,6 @@ class VectorTemplate extends BaseTemplate {
        /**
         * Render one or more navigations elements by name, automatically reveresed
         * when UI is in RTL mode
-        *
-        * @param $elements array
         */
        private function renderNavigation( $elements ) {
                global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang;