From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 28 Jan 2011 15:25:15 +0000 (+0000)
Subject: Followup r81132, missed some more ts2 removal
X-Git-Tag: 1.31.0-rc.0~32325
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=69d2ee1095c2ce985eba2b7a72ec30e5a5c867c7;p=lhc%2Fweb%2Fwiklou.git

Followup r81132, missed some more ts2 removal
---

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 23a67b62a3..bf8b6bdc11 100644
--- 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 ec9f36087b..fdbaa883ec 100644
--- 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" );