Table prefix bugs

diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index 707cd5e..4e15ce8 100644 (file)
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -101,7 +101,7 @@ class LinksUpdate {
                                        'bl_from'=>$this->mId,
                                        'bl_to'=>$blt));
                        }
-                       $dbw->insertArray($brokenlinks,$arr,array('IGNORE'));
+                       $dbw->insertArray( 'brokenlinks',$arr,array('IGNORE'));
                        $dbw->query( $sql, $fname );
                }
 

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index 53e947c..101ae7f 100644 (file)
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -196,6 +196,7 @@ CREATE TABLE objectcache (
 */
 class /* abstract */ SqlBagOStuff extends BagOStuff {
        var $table;
+
        function SqlBagOStuff($tablename = 'objectcache') {
                $this->table = $tablename;
        }
@@ -242,9 +243,13 @@ class /* abstract */ SqlBagOStuff extends BagOStuff {
                return true; /* ? */
        }
        
+       function getTableName() {
+               return $this->table;
+       }
+       
        function _query($sql) {
                $reps = func_get_args();
-               $reps[0] = $this->table;
+               $reps[0] = $this->getTableName();
                // ewwww
                for($i=0;$i<count($reps);$i++) {
                        $sql = str_replace(
@@ -303,6 +308,8 @@ class /* abstract */ SqlBagOStuff extends BagOStuff {
 }
 
 class MediaWikiBagOStuff extends SqlBagOStuff {
+       var $tableInitialised = false;
+
        function _doquery($sql) {
                $dbw =& wfGetDB( DB_MASTER );
                return $dbw->query($sql, 'MediaWikiBagOStuff:_doquery');
@@ -329,6 +336,14 @@ class MediaWikiBagOStuff extends SqlBagOStuff {
                $dbw =& wfGetDB( DB_MASTER );
                return $dbw->strencode($s);
        }
+       function getTableName() {
+               if ( !$this->tableInitialised ) {
+                       $dbw =& wfGetDB( DB_MASTER );
+                       $this->table = $dbw->tableName( $this->table );
+                       $this->tableInitialised = true;
+               }
+               return $this->table;
+       }
 }
 
 class TurckBagOStuff extends BagOStuff {