* (bug 1976) fix shared user database with a table prefix set

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a0a230f..362c9e5 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -267,6 +267,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2319) Fix parse hook tag matching
 * (bug 2329) Fix title formatting in several special pages
 * (bug 2223) Add unique index on user_name field to prevent duplicate accounts
+* (bug 1976) fix shared user database with a table prefix set
 
 
 === Caveats ===

diff --git a/includes/Database.php b/includes/Database.php
index 9355231..6509c7d 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1009,7 +1009,7 @@ class Database {
                        if ( $this->mTablePrefix !== '' &&  strpos( '.', $name ) === false ) {
                                $name = "{$this->mTablePrefix}$name";
                        }
-                       if ( isset( $wgSharedDB ) && 'user' == $name ) {
+                       if ( isset( $wgSharedDB ) && "{$this->mTablePrefix}user" == $name ) {
                                $name = "`$wgSharedDB`.`$name`";
                        } else {
                                # Standard quoting