r94024 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r94023‎ | r94024 | r94025 >
Date:12:06, 6 August 2011
Author:brion
Status:ok
Tags:
Comment:
Revert r89123 -- caused bug 30259 (switched correct calls with incorrect calls because of some interpretation of 'deprecation', causing invalid HTML output and breakage of watch tab on edit page)
Modified paths:
  • /trunk/phase3/skins/Chick.php (modified) (history)
  • /trunk/phase3/skins/CologneBlue.php (modified) (history)
  • /trunk/phase3/skins/Modern.php (modified) (history)
  • /trunk/phase3/skins/MonoBook.php (modified) (history)
  • /trunk/phase3/skins/Nostalgia.php (modified) (history)
  • /trunk/phase3/skins/Simple.php (modified) (history)
  • /trunk/phase3/skins/Standard.php (modified) (history)
  • /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/Simple.php
——@@ -21,9 +21,6 @@
2222 var $skinname = 'simple', $stylename = 'simple',
2323 $template = 'MonoBookTemplate', $useHeadElement = true;
2424
25 - /**
26 - * @param $out OutputPage
27 - */
2825 function setupSkinUserCss( OutputPage $out ) {
2926 parent::setupSkinUserCss( $out );
3027
Index: trunk/phase3/skins/CologneBlue.php
——@@ -19,9 +19,6 @@
2020 var $skinname = 'cologneblue', $stylename = 'cologneblue',
2121 $template = 'CologneBlueTemplate';
2222
23 - /**
24 - * @param $out OutputPage
25 - */
2623 function setupSkinUserCss( OutputPage $out ){
2724 parent::setupSkinUserCss( $out );
2825 $out->addModuleStyles( 'skins.cologneblue' );
——@@ -54,9 +51,6 @@
5552
5653 class CologneBlueTemplate extends LegacyTemplate {
5754
58 - /**
59 - * @return string
60 - */
6155 function doBeforeContent() {
6256 $mainPageObj = Title::newMainPage();
6357
——@@ -97,9 +91,6 @@
9892 return $s;
9993 }
10094
101 - /**
102 - * @return string
103 - */
10495 function doAfterContent(){
10596 global $wgLang;
10697
——@@ -141,9 +132,6 @@
142133 return $s;
143134 }
144135
145 - /**
146 - * @return string
147 - */
148136 function sysLinks() {
149137 global $wgUser, $wgLang;
150138 $li = SpecialPage::getTitleFor( 'Userlogin' );
——@@ -202,8 +190,6 @@
203191 /**
204192 * Compute the sidebar
205193 * @access private
206 - *
207 - * @return string
208194 */
209195 function quickBar(){
210196 global $wgOut, $wgUser;
——@@ -359,19 +345,11 @@
360346 return $s;
361347 }
362348
363 - /**
364 - * @param $key string
365 - * @return string
366 - */
367349 function menuHead( $key ) {
368350 $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
369351 return $s;
370352 }
371353
372 - /**
373 - * @param $label string
374 - * @return string
375 - */
376354 function searchForm( $label = '' ) {
377355 global $wgRequest, $wgUseTwoButtonsSearchForm;
378356
Index: trunk/phase3/skins/Standard.php
——@@ -18,9 +18,6 @@
1919 var $skinname = 'standard', $stylename = 'standard',
2020 $template = 'StandardTemplate';
2121
22 - /**
23 - * @param $out OutputPage
24 - */
2522 function setupSkinUserCss( OutputPage $out ){
2623 parent::setupSkinUserCss( $out );
2724 $out->addModuleStyles( 'skins.standard' );
——@@ -50,9 +47,6 @@
5148
5249 class StandardTemplate extends LegacyTemplate {
5350
54 - /**
55 - * @return string
56 - */
5751 function doAfterContent() {
5852 global $wgContLang, $wgLang;
5953 wfProfileIn( __METHOD__ );
——@@ -101,9 +95,6 @@
10296 return $s;
10397 }
10498
105 - /**
106 - * @return string
107 - */
10899 function quickBar() {
109100 global $wgOut, $wgUser, $wgRequest, $wgContLang;
110101
Index: trunk/phase3/skins/Vector.php
——@@ -108,7 +108,7 @@
109109 }
110110 if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
111111 $nav[$section][$key]['key'] =
112 - Linker::titleAttrib( $xmlID );
 112+ Linker::tooltip( $xmlID );
113113 } else {
114114 $nav[$section][$key]['key'] =
115115 Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
——@@ -302,7 +302,7 @@
303303 $msg = $name;
304304 }
305305 ?>
306 -<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::titleAttrib( 'p-' . $name ) ?>>
 306+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
307307 <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5>
308308 <div class="body">
309309 <?php
——@@ -332,8 +332,6 @@
333333 /**
334334 * Render one or more navigations elements by name, automatically reveresed
335335 * when UI is in RTL mode
336 - *
337 - * @param $elements array
338336 */
339337 private function renderNavigation( $elements ) {
340338 global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang;
Index: trunk/phase3/skins/Nostalgia.php
——@@ -18,9 +18,6 @@
1919 var $skinname = 'nostalgia', $stylename = 'nostalgia',
2020 $template = 'NostalgiaTemplate';
2121
22 - /**
23 - * @param $out OutputPage
24 - */
2522 function setupSkinUserCss( OutputPage $out ){
2623 parent::setupSkinUserCss( $out );
2724 $out->addModuleStyles( 'skins.nostalgia' );
——@@ -30,9 +27,6 @@
3128
3229 class NostalgiaTemplate extends LegacyTemplate {
3330
34 - /**
35 - * @return string
36 - */
3731 function doBeforeContent() {
3832 $s = "\n<div id='content'>\n<div id='top'>\n";
3933 $s .= '<div id="logo">' . $this->getSkin()->logoText( 'right' ) . '</div>';
——@@ -65,9 +59,6 @@
6660 return $s;
6761 }
6862
69 - /**
70 - * @return string
71 - */
7263 function topLinks() {
7364 global $wgOut, $wgUser;
7465 $sep = " |\n";
——@@ -114,9 +105,6 @@
115106 return $s;
116107 }
117108
118 - /**
119 - * @return string
120 - */
121109 function doAfterContent() {
122110 $s = "\n</div><br clear='all' />\n";
123111
Index: trunk/phase3/skins/Chick.php
——@@ -21,9 +21,6 @@
2222 var $skinname = 'chick', $stylename = 'chick',
2323 $template = 'MonoBookTemplate', $useHeadElement = true;
2424
25 - /**
26 - * @param $out OutputPage
27 - */
2825 function setupSkinUserCss( OutputPage $out ){
2926 parent::setupSkinUserCss( $out );
3027
Index: trunk/phase3/skins/MonoBook.php
——@@ -23,9 +23,6 @@
2424 var $skinname = 'monobook', $stylename = 'monobook',
2525 $template = 'MonoBookTemplate', $useHeadElement = true;
2626
27 - /**
28 - * @param $out OutputPage
29 - */
3027 function setupSkinUserCss( OutputPage $out ) {
3128 global $wgHandheldStyle;
3229 parent::setupSkinUserCss( $out );
——@@ -219,8 +216,6 @@
220217 /**
221218 * Prints the cactions bar.
222219 * Shared between MonoBook and Modern
223 - *
224 - * @param $skin Skin
225220 */
226221 function cactions() {
227222 ?>
Index: trunk/phase3/skins/Modern.php
——@@ -21,9 +21,6 @@
2222 var $skinname = 'modern', $stylename = 'modern',
2323 $template = 'ModernTemplate', $useHeadElement = true;
2424
25 - /**
26 - * @param $out OutputPage
27 - */
2825 function setupSkinUserCss( OutputPage $out ){
2926 parent::setupSkinUserCss( $out );
3027 $out->addModuleStyles ('skins.modern');

Follow-up revisions

RevisionCommit summaryAuthorDate
r94025MFT r94024: fix for bug 30259brion12:07, 6 August 2011
r94028Partial revert to r94024...reedy12:18, 6 August 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r89123Fix up a couple of deprecated calls...reedy18:32, 29 May 2011

Status & tagging log