Followup r93530

Fix SqliteUpdater

Fix Undefined index: globaltemplatelinks in LinksUpdate

diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index 23c30cd..e5990a3 100644 (file)
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -378,9 +378,15 @@ class LinksUpdate {
                        $this->mDb->delete( $table, $where, __METHOD__ );
                }
                if ( count( $insertions ) ) {
-                       $this->mDb->insert( 'globaltemplatelinks', $insertions['globaltemplatelinks'], __METHOD__, 'IGNORE' );
-                       $this->mDb->insert( 'globalnamespaces', $insertions['globalnamespaces'], __METHOD__, 'IGNORE' );
-                       $this->mDb->insert( 'globalinterwiki', $insertions['globalinterwiki'], __METHOD__, 'IGNORE' );
+                       if ( isset( $insertions['globaltemplatelinks'] ) ) {
+                               $this->mDb->insert( 'globaltemplatelinks', $insertions['globaltemplatelinks'], __METHOD__, 'IGNORE' );
+                       }
+                       if ( isset( $insertions['globalnamespaces'] ) ) {
+                               $this->mDb->insert( 'globalnamespaces', $insertions['globalnamespaces'], __METHOD__, 'IGNORE' );
+                       }
+                       if ( isset( $insertions['globalinterwiki'] ) ) {
+                               $this->mDb->insert( 'globalinterwiki', $insertions['globalinterwiki'], __METHOD__, 'IGNORE' );
+                       }
                }
        }
 

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index c096b84..91a59ae 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -186,8 +186,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        // 1.19
                        array( 'addTable', 'config',                            'patch-config.sql' ),
                        array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
-
-                       // 1.19
                        array( 'addTable', 'globaltemplatelinks', 'patch-globaltemplatelinks.sql' ),
                        array( 'addTable', 'globalnamespaces', 'patch-globalnamespaces.sql' ),
                        array( 'addTable', 'globalinterwiki', 'patch-globalinterwiki.sql' ),

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 3b6df6e..548e116 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -63,6 +63,9 @@ class SqliteUpdater extends DatabaseUpdater {
                        // 1.19
                        array( 'addTable', 'config',                            'patch-config.sql' ),
                        array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
+                       array( 'addTable', 'globaltemplatelinks', 'patch-globaltemplatelinks.sql' ),
+                       array( 'addTable', 'globalnamespaces', 'patch-globalnamespaces.sql' ),
+                       array( 'addTable', 'globalinterwiki', 'patch-globalinterwiki.sql' ),
                );
        }