r44768 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r44767‎ | r44768 | r44769 >
Date:12:47, 18 December 2008
Author:werdna
Status:ok
Tags:
Comment:
Add re-initialisation after Wikimedia hack.
Modified paths:
  • /trunk/extensions/Configure/Configure.obj.php (modified) (history)
  • /trunk/extensions/Configure/SpecialViewConfig.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.obj.php
@@ -215,12 +215,12 @@
216216 ## Hack for Wikimedia
217217 static $initialiseSettingsDone = false;
218218
219 - // This is a damn dirty hack
220219 if ( !$initialiseSettingsDone ) {
221220 $initialiseSettingsDone = true;
222221 global $IP, $wgConf;
223222 if( file_exists( "$IP/InitialiseSettings.php" ) ) {
224223 require_once "$IP/InitialiseSettings.php";
 224+ $this->initialise( false );
225225 }
226226 }
227227
Index: trunk/extensions/Configure/SpecialViewConfig.php
@@ -56,10 +56,8 @@
5757
5858 if ( isset( $conf[$wiki] ) ) {
5959 $this->conf = $conf[$wiki];
60 - } else if ( !isset( $this->diff ) ) {
61 - $msg = wfMsgNoTrans( 'configure-old-not-available', $version );
62 - $wgOut->addWikiText( "<div class='errorbox'>$msg</div>" );
63 - return false;
 60+ } else {
 61+ $this->conf = array();
6462 }
6563 } else {
6664 $msg = wfMsgNoTrans( 'configure-old-not-available', $version );

Status & tagging log