r94028 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r94027‎ | r94028 | r94029 >
Date:12:18, 6 August 2011
Author:reedy
Status:ok
Tags:
Comment:
Partial revert to r94024

Only 2 lines in Vector needed reverting, not the whole revision
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,6 +21,9 @@
2222 var $skinname = 'simple', $stylename = 'simple',
2323 $template = 'MonoBookTemplate', $useHeadElement = true;
2424
 25+ /**
 26+ * @param $out OutputPage
 27+ */
2528 function setupSkinUserCss( OutputPage $out ) {
2629 parent::setupSkinUserCss( $out );
2730
Index: trunk/phase3/skins/CologneBlue.php
——@@ -19,6 +19,9 @@
2020 var $skinname = 'cologneblue', $stylename = 'cologneblue',
2121 $template = 'CologneBlueTemplate';
2222
 23+ /**
 24+ * @param $out OutputPage
 25+ */
2326 function setupSkinUserCss( OutputPage $out ){
2427 parent::setupSkinUserCss( $out );
2528 $out->addModuleStyles( 'skins.cologneblue' );
——@@ -51,6 +54,9 @@
5255
5356 class CologneBlueTemplate extends LegacyTemplate {
5457
 58+ /**
 59+ * @return string
 60+ */
5561 function doBeforeContent() {
5662 $mainPageObj = Title::newMainPage();
5763
——@@ -91,6 +97,9 @@
9298 return $s;
9399 }
94100
 101+ /**
 102+ * @return string
 103+ */
95104 function doAfterContent(){
96105 global $wgLang;
97106
——@@ -132,6 +141,9 @@
133142 return $s;
134143 }
135144
 145+ /**
 146+ * @return string
 147+ */
136148 function sysLinks() {
137149 global $wgUser, $wgLang;
138150 $li = SpecialPage::getTitleFor( 'Userlogin' );
——@@ -190,6 +202,8 @@
191203 /**
192204 * Compute the sidebar
193205 * @access private
 206+ *
 207+ * @return string
194208 */
195209 function quickBar(){
196210 global $wgOut, $wgUser;
——@@ -345,11 +359,19 @@
346360 return $s;
347361 }
348362
 363+ /**
 364+ * @param $key string
 365+ * @return string
 366+ */
349367 function menuHead( $key ) {
350368 $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
351369 return $s;
352370 }
353371
 372+ /**
 373+ * @param $label string
 374+ * @return string
 375+ */
354376 function searchForm( $label = '' ) {
355377 global $wgRequest, $wgUseTwoButtonsSearchForm;
356378
Index: trunk/phase3/skins/Standard.php
——@@ -18,6 +18,9 @@
1919 var $skinname = 'standard', $stylename = 'standard',
2020 $template = 'StandardTemplate';
2121
 22+ /**
 23+ * @param $out OutputPage
 24+ */
2225 function setupSkinUserCss( OutputPage $out ){
2326 parent::setupSkinUserCss( $out );
2427 $out->addModuleStyles( 'skins.standard' );
——@@ -47,6 +50,9 @@
4851
4952 class StandardTemplate extends LegacyTemplate {
5053
 54+ /**
 55+ * @return string
 56+ */
5157 function doAfterContent() {
5258 global $wgContLang, $wgLang;
5359 wfProfileIn( __METHOD__ );
——@@ -95,6 +101,9 @@
96102 return $s;
97103 }
98104
 105+ /**
 106+ * @return string
 107+ */
99108 function quickBar() {
100109 global $wgOut, $wgUser, $wgRequest, $wgContLang;
101110
Index: trunk/phase3/skins/Vector.php
——@@ -332,6 +332,8 @@
333333 /**
334334 * Render one or more navigations elements by name, automatically reveresed
335335 * when UI is in RTL mode
 336+ *
 337+ * @param $elements array
336338 */
337339 private function renderNavigation( $elements ) {
338340 global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang;
Index: trunk/phase3/skins/Nostalgia.php
——@@ -18,6 +18,9 @@
1919 var $skinname = 'nostalgia', $stylename = 'nostalgia',
2020 $template = 'NostalgiaTemplate';
2121
 22+ /**
 23+ * @param $out OutputPage
 24+ */
2225 function setupSkinUserCss( OutputPage $out ){
2326 parent::setupSkinUserCss( $out );
2427 $out->addModuleStyles( 'skins.nostalgia' );
——@@ -27,6 +30,9 @@
2831
2932 class NostalgiaTemplate extends LegacyTemplate {
3033
 34+ /**
 35+ * @return string
 36+ */
3137 function doBeforeContent() {
3238 $s = "\n<div id='content'>\n<div id='top'>\n";
3339 $s .= '<div id="logo">' . $this->getSkin()->logoText( 'right' ) . '</div>';
——@@ -59,6 +65,9 @@
6066 return $s;
6167 }
6268
 69+ /**
 70+ * @return string
 71+ */
6372 function topLinks() {
6473 global $wgOut, $wgUser;
6574 $sep = " |\n";
——@@ -105,6 +114,9 @@
106115 return $s;
107116 }
108117
 118+ /**
 119+ * @return string
 120+ */
109121 function doAfterContent() {
110122 $s = "\n</div><br clear='all' />\n";
111123
Index: trunk/phase3/skins/Chick.php
——@@ -21,6 +21,9 @@
2222 var $skinname = 'chick', $stylename = 'chick',
2323 $template = 'MonoBookTemplate', $useHeadElement = true;
2424
 25+ /**
 26+ * @param $out OutputPage
 27+ */
2528 function setupSkinUserCss( OutputPage $out ){
2629 parent::setupSkinUserCss( $out );
2730
Index: trunk/phase3/skins/MonoBook.php
——@@ -23,6 +23,9 @@
2424 var $skinname = 'monobook', $stylename = 'monobook',
2525 $template = 'MonoBookTemplate', $useHeadElement = true;
2626
 27+ /**
 28+ * @param $out OutputPage
 29+ */
2730 function setupSkinUserCss( OutputPage $out ) {
2831 global $wgHandheldStyle;
2932 parent::setupSkinUserCss( $out );
——@@ -216,6 +219,8 @@
217220 /**
218221 * Prints the cactions bar.
219222 * Shared between MonoBook and Modern
 223+ *
 224+ * @param $skin Skin
220225 */
221226 function cactions() {
222227 ?>
Index: trunk/phase3/skins/Modern.php
——@@ -21,6 +21,9 @@
2222 var $skinname = 'modern', $stylename = 'modern',
2323 $template = 'ModernTemplate', $useHeadElement = true;
2424
 25+ /**
 26+ * @param $out OutputPage
 27+ */
2528 function setupSkinUserCss( OutputPage $out ){
2629 parent::setupSkinUserCss( $out );
2730 $out->addModuleStyles ('skins.modern');

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r94024Revert r89123 -- caused bug 30259 (switched correct calls with incorrect call...brion12:06, 6 August 2011

Status & tagging log