ported improved table quoting from 1.4

diff --git a/includes/Database.php b/includes/Database.php
index fee9453..7c38b0f 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -964,17 +964,18 @@ class Database {
         */
        function tableName( $name ) {
                global $wgSharedDB;
-               if ( $this->mTablePrefix !== '' ) {
-                       if ( strpos( '.', $name ) === false ) {
-                               $name = $this->mTablePrefix . $name;
+               # Skip quoted literals
+               if ( $name{0} != '`' ) {
+                       if ( $this->mTablePrefix !== '' &&  strpos( '.', $name ) === false ) {
+                               $name = "{$this->mTablePrefix}$name";
                        }
-               }
-               if ( isset( $wgSharedDB ) && 'user' == $name ) {
-                       $name = $wgSharedDB . '.' . $name;
-               }
-               if( $name == 'group' ) {
-                       $name = '`' . $name . '`';
-               }
+                       if ( isset( $wgSharedDB ) && 'user' == $name ) {
+                               $name = "`$wgSharedDB`.`$name`";
+                       } else {
+                               # Standard quoting
+                               $name = "`$name`";
+                       }
+               }               
                return $name;
        }