http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89679
Revision: 89679
Author: demon
Date: 2011-06-07 19:24:38 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
MFT r89529, r89532
Modified Paths:
--------------
branches/REL1_17/phase3/includes/installer/DatabaseUpdater.php
branches/REL1_17/phase3/includes/installer/Installer.php
branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
branches/REL1_17/phase3/maintenance/install.php
Property Changed:
----------------
branches/REL1_17/phase3/includes/installer/
branches/REL1_17/phase3/includes/installer/Installer.php
branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
branches/REL1_17/phase3/maintenance/install.php
Property changes on: branches/REL1_17/phase3/includes/installer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer:51646
/branches/new-installer/phase3/includes/installer:43664-66004
/branches/sqlite/includes/installer:58211-58321
/branches/wmf-deployment/includes/installer:53381
/trunk/phase3/includes/installer:82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,88658,89311
+ /branches/REL1_15/phase3/includes/installer:51646
/branches/new-installer/phase3/includes/installer:43664-66004
/branches/sqlite/includes/installer:58211-58321
/branches/wmf-deployment/includes/installer:53381
/trunk/phase3/includes/installer:82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,88658,89311,89529
Modified: branches/REL1_17/phase3/includes/installer/DatabaseUpdater.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/DatabaseUpdater.php
2011-06-07 19:20:00 UTC (rev 89678)
+++ branches/REL1_17/phase3/includes/installer/DatabaseUpdater.php
2011-06-07 19:24:38 UTC (rev 89679)
@@ -66,6 +66,7 @@
$this->maintenance = new FakeMaintenance;
}
$this->initOldGlobals();
+ $this->loadExtensions();
wfRunHooks( 'LoadExtensionSchemaUpdates', array( $this ) );
}
@@ -88,7 +89,25 @@
}
/**
- * @static
+ * Loads LocalSettings.php, if needed, and initialises everything
needed for LoadExtensionSchemaUpdates hook
+ */
+ private function loadExtensions() {
+ if ( !defined( 'MEDIAWIKI_INSTALL' ) ) {
+ return; // already loaded
+ }
+ $vars = Installer::getExistingLocalSettings();
+ if ( !$vars ) {
+ return; // no LocalSettings found
+ }
+ if ( !isset( $vars['wgHooks'] ) && !isset(
$vars['wgHooks']['LoadExtensionSchemaUpdates'] ) ) {
+ return;
+ }
+ global $wgHooks, $wgAutoloadClasses;
+ $wgHooks['LoadExtensionSchemaUpdates'] =
$vars['wgHooks']['LoadExtensionSchemaUpdates'];
+ $wgAutoloadClasses = $wgAutoloadClasses +
$vars['wgAutoloadClasses'];
+ }
+
+ /**
* @throws MWException
* @param DatabaseBase $db
* @param bool $shared
Modified: branches/REL1_17/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/Installer.php 2011-06-07
19:20:00 UTC (rev 89678)
+++ branches/REL1_17/phase3/includes/installer/Installer.php 2011-06-07
19:24:38 UTC (rev 89679)
@@ -453,7 +453,7 @@
*
* @return Array
*/
- public function getExistingLocalSettings() {
+ public static function getExistingLocalSettings() {
global $IP;
wfSuppressWarnings();
Property changes on: branches/REL1_17/phase3/includes/installer/Installer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/Installer.php:51646
/branches/new-installer/phase3/includes/installer/Installer.php:43664-66004
/branches/sqlite/includes/installer/Installer.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.php:53381
/trunk/phase3/includes/installer/Installer.php:81731,82038-82039,82247,82845,82847-82848,84431,84464,84543,84553,84573-84574,84577,84579,84729,84755,84765,84820,84846,84875,84881-84882,84905,84970,84976,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394,87027,87203,87222,87265,87494,87497,87711,87840,88076,88492,88658,88870-88871,89003,89108,89114-89115,89129,89532,89615,89653
+ /branches/REL1_15/phase3/includes/installer/Installer.php:51646
/branches/new-installer/phase3/includes/installer/Installer.php:43664-66004
/branches/sqlite/includes/installer/Installer.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.php:53381
/trunk/phase3/includes/installer/Installer.php:81731,82038-82039,82247,82845,82847-82848,84431,84464,84543,84553,84573-84574,84577,84579,84729,84755,84765,84820,84846,84875,84881-84882,84905,84970,84976,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394,87027,87203,87222,87265,87494,87497,87711,87840,88076,88492,88658,88870-88871,89003,89108,89114-89115,89129,89529,89532,89615,89653
Modified: branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
2011-06-07 19:20:00 UTC (rev 89678)
+++ branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
2011-06-07 19:24:38 UTC (rev 89679)
@@ -219,7 +219,7 @@
class WebInstaller_ExistingWiki extends WebInstallerPage {
public function execute() {
// If there is no LocalSettings.php, continue to the installer
welcome page
- $vars = $this->parent->getExistingLocalSettings();
+ $vars = Installer::getExistingLocalSettings();
if ( !$vars ) {
return 'skip';
}
Property changes on:
branches/REL1_17/phase3/includes/installer/WebInstallerPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/WebInstallerPage.php:51646
/branches/new-installer/phase3/includes/installer/WebInstallerPage.php:43664-66004
/branches/sqlite/includes/installer/WebInstallerPage.php:58211-58321
/branches/wmf-deployment/includes/installer/WebInstallerPage.php:53381
/trunk/phase3/includes/installer/WebInstallerPage.php:78043,78078,78231,78259,78285,78300,78450,78531-78532,78823,78946,79056,79066,79089,79191,79246,79283,79358,79480,79503,79537,79678,79684,79693,79738,79741,79745,79750,79767-79768,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80540,80679,80685,80694,80864,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,84875,84881-84882,84970,84976,85021,85066,87488,88658
+ /branches/REL1_15/phase3/includes/installer/WebInstallerPage.php:51646
/branches/new-installer/phase3/includes/installer/WebInstallerPage.php:43664-66004
/branches/sqlite/includes/installer/WebInstallerPage.php:58211-58321
/branches/wmf-deployment/includes/installer/WebInstallerPage.php:53381
/trunk/phase3/includes/installer/WebInstallerPage.php:78043,78078,78231,78259,78285,78300,78450,78531-78532,78823,78946,79056,79066,79089,79191,79246,79283,79358,79480,79503,79537,79678,79684,79693,79738,79741,79745,79750,79767-79768,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80540,80679,80685,80694,80864,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,84875,84881-84882,84970,84976,85021,85066,87488,88658,89529
Modified: branches/REL1_17/phase3/maintenance/install.php
===================================================================
--- branches/REL1_17/phase3/maintenance/install.php 2011-06-07 19:20:00 UTC
(rev 89678)
+++ branches/REL1_17/phase3/maintenance/install.php 2011-06-07 19:24:38 UTC
(rev 89679)
@@ -27,6 +27,7 @@
}
define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' );
+define( 'MEDIAWIKI_INSTALL', true );
require_once( dirname( dirname( __FILE__ ) )."/maintenance/Maintenance.php" );
Property changes on: branches/REL1_17/phase3/maintenance/install.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/install.php:51646
/branches/new-installer/phase3/maintenance/install.php:43664-66004
/branches/sqlite/maintenance/install.php:58211-58321
/trunk/phase3/maintenance/install.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81519,81731,82038-82039,84431,84464,84543,84553,84573-84574,84577,84579,84729,84756,84765,84820,84846,84905,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394
+ /branches/REL1_15/phase3/maintenance/install.php:51646
/branches/new-installer/phase3/maintenance/install.php:43664-66004
/branches/sqlite/maintenance/install.php:58211-58321
/trunk/phase3/maintenance/install.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81519,81731,82038-82039,84431,84464,84543,84553,84573-84574,84577,84579,84729,84756,84765,84820,84846,84905,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394,89529
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
