* In selectField(), use reset($row) instead of $row[0] for compatibility with SQLite

* Non-broken (no-op) implementation of DatabaseSqlite::deadlockLoop(). Fixes bug 16123: total breakage of Special:Import on SQLite.

diff --git a/includes/db/Database.php b/includes/db/Database.php
index e4c41a8..84b8864 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -922,7 +922,7 @@ class Database {
                $row = $this->fetchRow( $res );
                if ( $row !== false ) {
                        $this->freeResult( $res );
-                       return $row[0];
+                       return reset( $row );
                } else {
                        return false;
                }

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 814f9bc..dfc506c 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -410,6 +410,14 @@ class DatabaseSqlite extends Database {
                return "SearchEngineDummy";
        }
 
+       /**
+        * No-op version of deadlockLoop
+        */
+       public function deadlockLoop( /*...*/ ) {
+               $args = func_get_args();
+               $function = array_shift( $args );
+               return call_user_func_array( $function, $args );
+       }
 }
 
 /**