http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93531
Revision: 93531
Author: reedy
Date: 2011-07-30 15:41:39 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Followup r93530
Fix SqliteUpdater
Fix Undefined index: globaltemplatelinks in LinksUpdate
Modified Paths:
--------------
trunk/phase3/includes/LinksUpdate.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/includes/installer/SqliteUpdater.php
Modified: trunk/phase3/includes/LinksUpdate.php
===================================================================
--- trunk/phase3/includes/LinksUpdate.php 2011-07-30 15:30:01 UTC (rev
93530)
+++ trunk/phase3/includes/LinksUpdate.php 2011-07-30 15:41:39 UTC (rev
93531)
@@ -378,9 +378,15 @@
$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' );
+ }
}
}
Modified: trunk/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- trunk/phase3/includes/installer/MysqlUpdater.php 2011-07-30 15:30:01 UTC
(rev 93530)
+++ trunk/phase3/includes/installer/MysqlUpdater.php 2011-07-30 15:41:39 UTC
(rev 93531)
@@ -186,8 +186,6 @@
// 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' ),
Modified: trunk/phase3/includes/installer/SqliteUpdater.php
===================================================================
--- trunk/phase3/includes/installer/SqliteUpdater.php 2011-07-30 15:30:01 UTC
(rev 93530)
+++ trunk/phase3/includes/installer/SqliteUpdater.php 2011-07-30 15:41:39 UTC
(rev 93531)
@@ -63,6 +63,9 @@
// 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' ),
);
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
