http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89586
Revision: 89586
Author: brion
Date: 2011-06-06 18:35:28 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Revert r89263, r89297, r89347: unclear whether this is needed; DatabaseUpdater
actions list is already extensible and it might just need some rearrangement?
Modified Paths:
--------------
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/ExtensionUpdater.php
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2011-06-06 17:55:19 UTC
(rev 89585)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2011-06-06 18:35:28 UTC
(rev 89586)
@@ -31,12 +31,6 @@
protected $extensionUpdates = array();
/**
- * List of extension-provided database updaters
- * @var array
- */
- protected $extensionUpdaters = array();
-
- /**
* Used to hold schema files during installation process
* @var array
*/
@@ -173,17 +167,6 @@
}
/**
- * Add a updater class that will handle extensions DB install/update.
- * This should be called by extensions while executing the
- * LoadExtensionSchemaUpdates hook.
- *
- * @param $updater (string) classname (extends DatabaseUpdater).
- */
- public function addExtensionUpdater( $updater ) {
- $this->extensionUpdaters[] = $updater;
- }
-
- /**
* Convenience wrapper for addExtensionUpdate() when adding a new table
(which
* is the most common usage of updaters in an extension)
* @param $tableName String Name of table to create
@@ -219,15 +202,6 @@
return $this->extensionUpdates;
}
- /**
- * Get the list of extension-defined updaters
- *
- * @return Array
- */
- protected function getExtensionUpdaters() {
- return $this->extensionUpdaters;
- }
-
public function getPostDatabaseUpdateMaintenance() {
return $this->postDatabaseUpdateMaintenance;
}
@@ -247,10 +221,6 @@
if ( isset( $what['extensions'] ) ) {
$this->runUpdates( $this->getOldGlobalUpdates(), false
);
$this->runUpdates( $this->getExtensionUpdates(), true );
- foreach ( $this->getExtensionUpdaters() as
$updaterClass ) {
- $eupdater = new $updaterClass( $this );
- $eupdater->doUpdates();
- }
}
$this->setAppliedUpdates( $wgVersion, $this->updates );
Modified: trunk/phase3/includes/installer/ExtensionUpdater.php
===================================================================
--- trunk/phase3/includes/installer/ExtensionUpdater.php 2011-06-06
17:55:19 UTC (rev 89585)
+++ trunk/phase3/includes/installer/ExtensionUpdater.php 2011-06-06
18:35:28 UTC (rev 89586)
@@ -1,16 +0,0 @@
-<?php
-
-class ExtensionUpdater extends DatabaseUpdater {
-
- // overload the constructor, so the init and hooks don't get called
- // while still have all the patching code without duplicating
- public function __construct( DatabaseBase &$db, $shared, Maintenance
$maintenance = null ) {
- $this->db = $db;
- $this->shared = $shared;
- $this->maintenance = $maintenance;
- }
-
- public function doUpdates() {
- $this->runUpdates( $this->getCoreUpdateList(), false );
- }
-}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs