From: Platonides Date: Thu, 15 Dec 2011 21:12:27 +0000 (+0000) Subject: Use the canonical name of the setting X-Git-Tag: 1.31.0-rc.0~25948 X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=2840d9809be4b556575687caee55815343b87176;p=lhc%2Fweb%2Fwiklou.git Use the canonical name of the setting --- diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 1c5b684411..aa0b8ab69e 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -624,7 +624,7 @@ class DatabasePostgres extends DatabaseBase { } function tableName( $name, $format = 'quoted' ) { - global $wgSharedDB, $wgSharedTables, $wgDBmwSchema; + global $wgSharedDB, $wgSharedTables, $wgDBmwschema; # Skip quoted tablenames. if ( $this->isQuotedIdentifier( $name ) ) { return $name; @@ -659,13 +659,13 @@ class DatabasePostgres extends DatabaseBase { } } if ( !isset( $schema )) { - $schema = "\"{$wgDBmwSchema}\"."; + $schema = "\"{$wgDBmwschema}\"."; } else { # keep old schema, but quote it. $schema = "\"{$schema}\"."; } - # during installation wgDBmwSchema is not set, so we would end up quering - # ""."table" => error. Erase the first part if wgDBmwSchema is empty + # 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 = ""; }