Followup r81132, missed some more ts2 removal

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 23a67b6..bf8b6bd 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -21,7 +21,6 @@ class PostgresInstaller extends DatabaseInstaller {
                'wgDBuser',
                'wgDBpassword',
                'wgDBmwschema',
-               'wgDBts2schema',
        );
 
        var $minimumVersion = '8.3';
@@ -288,12 +287,10 @@ class PostgresInstaller extends DatabaseInstaller {
        function getLocalSettings() {
                $port = $this->getVar( 'wgDBport' );
                $schema = $this->getVar( 'wgDBmwschema' );
-               $ts2 = $this->getVar( 'wgDBts2schema' );
                return
 "# Postgres specific settings
 \$wgDBport           = \"{$port}\";
-\$wgDBmwschema       = \"{$schema}\";
-\$wgDBts2schema      = \"{$ts2}\";";
+\$wgDBmwschema       = \"{$schema}\";";
        }
 
        public function preUpgrade() {

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index ec9f360..fdbaa88 100644 (file)
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -514,7 +514,7 @@ END;
         * Verify that this user is configured correctly
         */
        protected function checkPgUser() {
-               global $wgDBmwschema, $wgDBts2schema, $wgDBuser;
+               global $wgDBmwschema, $wgDBuser;
 
                $config = $this->db->selectField( 
                        'pg_catalog.pg_user', "array_to_string(useconfig,'*')",
@@ -536,10 +536,6 @@ END;
                        $this->output( "Adding in schema \"$wgDBmwschema\" to search_path for user \"$wgDBuser\"\n" );
                        $search_path = "$wgDBmwschema, $search_path";
                }
-               if ( strpos( $search_path, $wgDBts2schema ) === false ) {
-                       $this->output( "Adding in schema \"$wgDBts2schema\" to search_path for user \"$wgDBuser\"\n" );
-                       $search_path = "$search_path, $wgDBts2schema";
-               }
                $search_path = str_replace( ', ,', ',', $search_path );
                if ( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
                        $this->db->query( "ALTER USER $wgDBuser SET search_path = $search_path" );