| Index: branches/REL1_16/phase3/maintenance/doMaintenance.php |
| — | — | @@ -76,6 +76,11 @@ |
| 77 | 77 | } else { |
| 78 | 78 | require_once( $maintenance->loadSettings() ); |
| 79 | 79 | } |
| | 80 | +if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && |
| | 81 | + is_readable( "$IP/AdminSettings.php" ) ) |
| | 82 | +{ |
| | 83 | + require( "$IP/AdminSettings.php" ); |
| | 84 | +} |
| 80 | 85 | $maintenance->finalSetup(); |
| 81 | 86 | // Some last includes |
| 82 | 87 | require_once( "$IP/includes/Setup.php" ); |
| Index: branches/REL1_16/phase3/maintenance/Maintenance.php |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | * Maintenance::DB_ADMIN - For admin DB access |
| 294 | 294 | * @return int |
| 295 | 295 | */ |
| 296 | | - protected function getDbType() { |
| | 296 | + public function getDbType() { |
| 297 | 297 | return Maintenance::DB_STD; |
| 298 | 298 | } |
| 299 | 299 | |
| Property changes on: branches/REL1_16/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 300 | 300 | Reverse-merged /branches/REL1_15/phase3:r51646 |
| 301 | 301 | Reverse-merged /branches/sqlite:r58211-58321 |
| 302 | 302 | Merged /trunk/phase3:r63545-63546 |