From: Chad Horohoe Date: Mon, 31 Jan 2011 20:09:29 +0000 (+0000) Subject: Fixups to r81266 X-Git-Tag: 1.31.0-rc.0~32283 X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=3f5e23548c6212cc6b1e6ca3c1fd603eab95dc0c;p=lhc%2Fweb%2Fwiklou.git Fixups to r81266 --- diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php index 16f42b821e..e71143f2ef 100644 --- a/includes/installer/DatabaseInstaller.php +++ b/includes/installer/DatabaseInstaller.php @@ -179,77 +179,6 @@ abstract class DatabaseInstaller { if ( !$status->isOK() ) { return $status; } - $this->db; - $updater = DatabaseUpdater::newForDB( $this->db ); - $extensionUpdates = $updater->getNewExtensions(); - - // No extensions need tables (or haven't updated to new installer support) - if( !count( $extensionUpdates ) ) { - return $status; - } - - $ourExtensions = array_map( 'strtolower', $this->getVar( '_Extensions' ) ); - - foreach( $ourExtensions as $ext ) { - if( isset( $extensionUpdates[$ext] ) ) { - $this->db->begin( __METHOD__ ); - $error = $this->db->sourceFile( $extensionUpdates[$ext] ); - if( $error !== true ) { - $this->db->rollback( __METHOD__ ); - $status->warning( 'config-install-tables-failed', $error ); - } else { - $this->db->commit( __METHOD__ ); - } - } - } - return $status; - } - - /** - * Create the tables for each extension the user enabled - * @return Status - */ - public function createExtensionTables() { - $status = $this->getConnection(); - if ( !$status->isOK() ) { - return $status; - } - $this->db; - $updater = DatabaseUpdater::newForDB( $this->db ); - $extensionUpdates = $updater->getNewExtensions(); - - // No extensions need tables (or haven't updated to new installer support) - if( !count( $extensionUpdates ) ) { - return $status; - } - - $ourExtensions = array_map( 'strtolower', $this->getVar( '_Extensions' ) ); - - foreach( $ourExtensions as $ext ) { - if( isset( $extensionUpdates[$ext] ) ) { - $this->db->begin( __METHOD__ ); - $error = $this->db->sourceFile( $extensionUpdates[$ext] ); - if( $error !== true ) { - $this->db->rollback( __METHOD__ ); - $status->warning( 'config-install-tables-failed', $error ); - } else { - $this->db->commit( __METHOD__ ); - } - } - } - return $status; - } - - /** - * Create the tables for each extension the user enabled - * @return Status - */ - public function createExtensionTables() { - $status = $this->getConnection(); - if ( !$status->isOK() ) { - return $status; - } - $this->db; $updater = DatabaseUpdater::newForDB( $this->db ); $extensionUpdates = $updater->getNewExtensions();