dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Restore Content-Language header change from e53ff931a"
[lhc/web/wiklou.git]
/
includes
/
installer
/
DatabaseInstaller.php
diff --git
a/includes/installer/DatabaseInstaller.php
b/includes/installer/DatabaseInstaller.php
index
ded2bd8
..
331d1a1
100644
(file)
--- a/
includes/installer/DatabaseInstaller.php
+++ b/
includes/installer/DatabaseInstaller.php
@@
-41,7
+41,7
@@
abstract class DatabaseInstaller {
/**
* The database connection.
*
/**
* The database connection.
*
- * @var Database
Base
+ * @var Database
*/
public $db = null;
*/
public $db = null;
@@
-167,7
+167,7
@@
abstract class DatabaseInstaller {
*
* @param string $sourceFileMethod
* @param string $stepName
*
* @param string $sourceFileMethod
* @param string $stepName
- * @param
string
$archiveTableMustNotExist
+ * @param
bool
$archiveTableMustNotExist
* @return Status
*/
private function stepApplySourceFile(
* @return Status
*/
private function stepApplySourceFile(
@@
-334,8
+334,7
@@
abstract class DatabaseInstaller {
$connection = $status->value;
$services->redefineService( 'DBLoadBalancerFactory', function() use ( $connection ) {
$connection = $status->value;
$services->redefineService( 'DBLoadBalancerFactory', function() use ( $connection ) {
- return new LBFactorySingle( [
- 'connection' => $connection ] );
+ return LBFactorySingle::newFromConnection( $connection );
} );
}
} );
}
@@
-354,10
+353,14
@@
abstract class DatabaseInstaller {
$up = DatabaseUpdater::newForDB( $this->db );
try {
$up->doUpdates();
$up = DatabaseUpdater::newForDB( $this->db );
try {
$up->doUpdates();
- } catch ( Exception $e ) {
+ } catch (
MW
Exception $e ) {
echo "\nAn error occurred:\n";
echo $e->getText();
$ret = false;
echo "\nAn error occurred:\n";
echo $e->getText();
$ret = false;
+ } catch ( Exception $e ) {
+ echo "\nAn error occurred:\n";
+ echo $e->getMessage();
+ $ret = false;
}
$up->purgeCache();
ob_end_flush();
}
$up->purgeCache();
ob_end_flush();