| Index: trunk/extensions/Configure/Configure.obj.php |
| — | — | @@ -10,8 +10,8 @@ |
| 11 | 11 | protected $mHandler; // Configuration handler |
| 12 | 12 | protected $mWiki; // Wiki name |
| 13 | 13 | protected $mConf = array(); // Our array of settings |
| 14 | | - protected $mOldSettings = null; // Old settings (before applying our overrides) |
| 15 | | - protected $mDefaults = null; // Default values |
| | 14 | + protected $mOldSettings = null; // Old settings (before applying our overrides) |
| | 15 | + protected $mDefaults = null; // Default values |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Construct a new object. |
| — | — | @@ -32,6 +32,12 @@ |
| 33 | 33 | */ |
| 34 | 34 | public function initialise( $useCache = true ) { |
| 35 | 35 | parent::initialise(); |
| | 36 | + |
| | 37 | + // Special case for manage.php maintenance script so that it can work |
| | 38 | + // even if the current configuration is broken |
| | 39 | + if ( defined( 'EXT_CONFIGURE_NO_EXTRACT' ) ) |
| | 40 | + return; |
| | 41 | + |
| 36 | 42 | $this->mConf = $this->mHandler->getCurrent( $useCache ); |
| 37 | 43 | |
| 38 | 44 | # Restore first version of $this->settings if called a second time so |
| — | — | @@ -93,11 +99,6 @@ |
| 94 | 100 | * extract settings for this wiki in $GLOBALS |
| 95 | 101 | */ |
| 96 | 102 | public function extract() { |
| 97 | | - // Special case for manage.php maintenance script so that it can work |
| 98 | | - // even if the current configuration is broken |
| 99 | | - if ( defined( 'EXT_CONFIGURE_NO_EXTRACT' ) ) |
| 100 | | - return; |
| 101 | | - |
| 102 | 103 | // Include files before so that customized settings won't be overridden |
| 103 | 104 | // by the default ones |
| 104 | 105 | $this->includeFiles(); |