| Index: trunk/phase3/includes/installer/PostgresUpdater.php |
| — | — | @@ -514,7 +514,7 @@ |
| 515 | 515 | * Verify that this user is configured correctly |
| 516 | 516 | */ |
| 517 | 517 | protected function checkPgUser() { |
| 518 | | - global $wgDBmwschema, $wgDBts2schema, $wgDBuser; |
| | 518 | + global $wgDBmwschema, $wgDBuser; |
| 519 | 519 | |
| 520 | 520 | $config = $this->db->selectField( |
| 521 | 521 | 'pg_catalog.pg_user', "array_to_string(useconfig,'*')", |
| — | — | @@ -536,10 +536,6 @@ |
| 537 | 537 | $this->output( "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n" ); |
| 538 | 538 | $search_path = "$wgDBmwschema, $search_path"; |
| 539 | 539 | } |
| 540 | | - if ( strpos( $search_path, $wgDBts2schema ) === false ) { |
| 541 | | - $this->output( "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n" ); |
| 542 | | - $search_path = "$search_path, $wgDBts2schema"; |
| 543 | | - } |
| 544 | 540 | $search_path = str_replace( ', ,', ',', $search_path ); |
| 545 | 541 | if ( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) { |
| 546 | 542 | $this->db->query( "ALTER USER $wgDBuser SET search_path = $search_path" ); |
| Index: trunk/phase3/includes/installer/PostgresInstaller.php |
| — | — | @@ -21,7 +21,6 @@ |
| 22 | 22 | 'wgDBuser', |
| 23 | 23 | 'wgDBpassword', |
| 24 | 24 | 'wgDBmwschema', |
| 25 | | - 'wgDBts2schema', |
| 26 | 25 | ); |
| 27 | 26 | |
| 28 | 27 | var $minimumVersion = '8.3'; |
| — | — | @@ -288,12 +287,10 @@ |
| 289 | 288 | function getLocalSettings() { |
| 290 | 289 | $port = $this->getVar( 'wgDBport' ); |
| 291 | 290 | $schema = $this->getVar( 'wgDBmwschema' ); |
| 292 | | - $ts2 = $this->getVar( 'wgDBts2schema' ); |
| 293 | 291 | return |
| 294 | 292 | "# Postgres specific settings |
| 295 | 293 | \$wgDBport = \"{$port}\"; |
| 296 | | -\$wgDBmwschema = \"{$schema}\"; |
| 297 | | -\$wgDBts2schema = \"{$ts2}\";"; |
| | 294 | +\$wgDBmwschema = \"{$schema}\";"; |
| 298 | 295 | } |
| 299 | 296 | |
| 300 | 297 | public function preUpgrade() { |