r112297 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r112296‎ | r112297 | r112298 >
Date:03:54, 24 February 2012
Author:tstarling
Status:ok
Tags:
Comment:
MFT r112296: fixes for 1.19 compatibility
Modified paths:
  • /branches/wmf/1.19wmf1/extensions/skins/Donate/Donate.class.php (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/skins/Schulenburg/Schulenburg.class.php (modified) (history)
  • /branches/wmf/1.19wmf1/extensions/skins/Tomas/Tomas.class.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/extensions/skins/Schulenburg/Schulenburg.class.php
@@ -11,8 +11,14 @@
1212 return "{$this->path}/main.js";
1313 }
1414
15 - function outputPage( OutputPage $out ) {
 15+ function outputPage( OutputPage $out = null ) {
1616 global $wgContLang, $wgSchulenburgSkinPath, $wgScriptPath;
 17+
 18+ if ( !$out ) {
 19+ // MW 1.19
 20+ $out = $this->getOutput();
 21+ }
 22+
1723 $lang = $wgContLang->getCode();
1824 $this->path = $wgSchulenburgSkinPath ? $wgSchulenburgSkinPath : "{$wgScriptPath}/extensions/skins/Schulenburg";
1925 $this->out = $out;
Index: branches/wmf/1.19wmf1/extensions/skins/Tomas/Tomas.class.php
@@ -11,8 +11,14 @@
1212 return "{$this->path}/main.js";
1313 }
1414
15 - function outputPage( OutputPage $out ) {
 15+ function outputPage( OutputPage $out = null ) {
1616 global $wgContLang, $wgTomasSkinPath, $wgScriptPath;
 17+
 18+ if ( !$out ) {
 19+ // MW 1.19
 20+ $out = $this->getOutput();
 21+ }
 22+
1723 $lang = $wgContLang->getCode();
1824 $this->path = $wgTomasSkinPath ? $wgTomasSkinPath : "{$wgScriptPath}/extensions/skins/Tomas";
1925 $this->out = $out;
Index: branches/wmf/1.19wmf1/extensions/skins/Donate/Donate.class.php
@@ -11,8 +11,14 @@
1212 return "{$this->path}/main.js";
1313 }
1414
15 - function outputPage( OutputPage $out ) {
 15+ function outputPage( OutputPage $out = null ) {
1616 global $wgContLang, $wgDonateSkinPath, $wgScriptPath;
 17+
 18+ if ( !$out ) {
 19+ // MW 1.19
 20+ $out = $this->getOutput();
 21+ }
 22+
1723 $lang = $wgContLang->getCode();
1824 $this->path = $wgDonateSkinPath ? $wgDonateSkinPath : "{$wgScriptPath}/extensions/skins/Donate";
1925 $this->out = $out;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r112296Updates for r95957/r95959, committing for test on servertstarling03:53, 24 February 2012

Status & tagging log