http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65304
Revision: 65304
Author: demon
Date: 2010-04-20 11:49:03 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
Tweak getInstallSteps() to actually work like I intended it to. No longer runs
full install on upgrade.
Modified Paths:
--------------
branches/new-installer/phase3/includes/installer/Installer.php
Modified: branches/new-installer/phase3/includes/installer/Installer.php
===================================================================
--- branches/new-installer/phase3/includes/installer/Installer.php
2010-04-20 11:47:55 UTC (rev 65303)
+++ branches/new-installer/phase3/includes/installer/Installer.php
2010-04-20 11:49:03 UTC (rev 65304)
@@ -128,7 +128,6 @@
);
var $installSteps = array(
- 'extensions',
'database',
'tables',
'secretkey',
@@ -808,12 +807,13 @@
return $exts;
}
-
-
public function getInstallSteps() {
- if( !count( $this->getVar( '_Extensions' ) ) ) {
- unset( $this->installSteps['extensions'] );
+ if( $this->getVar( '_UpgradeDone' ) ) {
+ $this->installSteps = array( 'localsettings' );
}
+ if( count( $this->getVar( '_Extensions' ) ) ) {
+ $this->installSteps = array_unshift(
$this->installSteps, 'extensions' );
+ }
return $this->installSteps;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
