http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93540
Revision: 93540
Author: reedy
Date: 2011-07-30 16:38:46 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Merge in r93533, r93531
Modified Paths:
--------------
branches/iwtransclusion/phase3v3/includes/LinksUpdate.php
branches/iwtransclusion/phase3v3/includes/installer/SqliteUpdater.php
Modified: branches/iwtransclusion/phase3v3/includes/LinksUpdate.php
===================================================================
--- branches/iwtransclusion/phase3v3/includes/LinksUpdate.php 2011-07-30
16:14:34 UTC (rev 93539)
+++ branches/iwtransclusion/phase3v3/includes/LinksUpdate.php 2011-07-30
16:38:46 UTC (rev 93540)
@@ -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' );
+ }
}
}
@@ -484,7 +490,7 @@
);
$arr['globalinterwiki'][] = array(
'giw_wikiid' =>
$wikiid,
- 'giw_prefix' =>
$prefix
+ 'giw_prefix' =>
$prefix // FIXME: $prefix ix undefined
);
$arr['globalnamespaces'][] = array(
'gn_wiki'
=> wfWikiID( ),
Modified: branches/iwtransclusion/phase3v3/includes/installer/SqliteUpdater.php
===================================================================
--- branches/iwtransclusion/phase3v3/includes/installer/SqliteUpdater.php
2011-07-30 16:14:34 UTC (rev 93539)
+++ branches/iwtransclusion/phase3v3/includes/installer/SqliteUpdater.php
2011-07-30 16:38:46 UTC (rev 93540)
@@ -60,6 +60,11 @@
array( 'addIndex', 'user', 'user_email',
'patch-user_email_index.sql' ),
array( 'addTable', 'config', 'patch-config.sql' ),
array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
+
+ // 1.19
+ 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
