summaryrefslogtreecommitdiff
path: root/includes/db/Database.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-09-02 15:19:34 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-09-02 15:19:34 +0200
commit9498a3d2852ace0f4ee23598f542dbce3fd2ec28 (patch)
tree5aeced25a9fc09f93682788259f5c7d6d248634d /includes/db/Database.php
parent588cc40aeec0165400421ef9612e81b6d2c7b936 (diff)
Update to MediaWiki 1.19.2
Diffstat (limited to 'includes/db/Database.php')
-rw-r--r--includes/db/Database.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 9d517e4a..f3e84675 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1973,7 +1973,9 @@ abstract class DatabaseBase implements DatabaseType {
# Quote the $database and $table and apply the prefix if not quoted.
if ( isset( $database ) ) {
- $database = ( $format == 'quoted' || $this->isQuotedIdentifier( $database ) ? $database : $this->addIdentifierQuotes( $database ) );
+ if ( $format == 'quoted' && !$this->isQuotedIdentifier( $database ) ) {
+ $database = $this->addIdentifierQuotes( $database );
+ }
}
$table = "{$prefix}{$table}";