From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 4 Jan 2012 18:01:10 +0000 (+0000)
Subject: re r106025 — apply follow up from Luca Fulchir
X-Git-Tag: 1.31.0-rc.0~25534
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=227dd89ec801ab891ade7616c2ec19e21ea3b4ac;p=lhc%2Fweb%2Fwiklou.git

re r106025 — apply follow up from Luca Fulchir
---

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 222e3c11b9..4f4636750a 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -645,7 +645,7 @@ class DatabasePostgres extends DatabaseBase {
 			$schema = '"' . $dbDetails[0] . '".';
 			$table  = $dbDetails [1];
 		} else {
-			$schema = "\"{$wgDBmwschema}\"."; # keep old schema, but quote it.
+			$schema = ""; # do NOT force the schema (due to temporary tables)
 			$table = $dbDetails[0];
 		}
 		if ( $format != 'quoted' ) {
@@ -659,11 +659,6 @@ class DatabasePostgres extends DatabaseBase {
 			}
 		}
 
-		# during installation wgDBmwschema is not set, so we would end up quering
-		# ""."table" => error. Erase the first part if wgDBmwschema is empty
-		if ( $schema == "\"\"." ) {
-			$schema = "";
-		}
 		if ( isset( $wgSharedDB ) # We have a shared database (=> schema)
 		  && isset( $wgSharedTables )
 		  && is_array( $wgSharedTables )