| Index: branches/iwtransclusion/phase3v3/includes/installer/SqliteUpdater.php |
| — | — | @@ -60,6 +60,11 @@ |
| 61 | 61 | array( 'addIndex', 'user', 'user_email', 'patch-user_email_index.sql' ), |
| 62 | 62 | array( 'addTable', 'config', 'patch-config.sql' ), |
| 63 | 63 | array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), |
| | 64 | + |
| | 65 | + // 1.19 |
| | 66 | + array( 'addTable', 'globaltemplatelinks', 'patch-globaltemplatelinks.sql' ), |
| | 67 | + array( 'addTable', 'globalnamespaces', 'patch-globalnamespaces.sql' ), |
| | 68 | + array( 'addTable', 'globalinterwiki', 'patch-globalinterwiki.sql' ), |
| 64 | 69 | ); |
| 65 | 70 | } |
| 66 | 71 | |
| Index: branches/iwtransclusion/phase3v3/includes/LinksUpdate.php |
| — | — | @@ -378,9 +378,15 @@ |
| 379 | 379 | $this->mDb->delete( $table, $where, __METHOD__ ); |
| 380 | 380 | } |
| 381 | 381 | if ( count( $insertions ) ) { |
| 382 | | - $this->mDb->insert( 'globaltemplatelinks', $insertions['globaltemplatelinks'], __METHOD__, 'IGNORE' ); |
| 383 | | - $this->mDb->insert( 'globalnamespaces', $insertions['globalnamespaces'], __METHOD__, 'IGNORE' ); |
| 384 | | - $this->mDb->insert( 'globalinterwiki', $insertions['globalinterwiki'], __METHOD__, 'IGNORE' ); |
| | 382 | + if ( isset( $insertions['globaltemplatelinks'] ) ) { |
| | 383 | + $this->mDb->insert( 'globaltemplatelinks', $insertions['globaltemplatelinks'], __METHOD__, 'IGNORE' ); |
| | 384 | + } |
| | 385 | + if ( isset( $insertions['globalnamespaces'] ) ) { |
| | 386 | + $this->mDb->insert( 'globalnamespaces', $insertions['globalnamespaces'], __METHOD__, 'IGNORE' ); |
| | 387 | + } |
| | 388 | + if ( isset( $insertions['globalinterwiki'] ) ) { |
| | 389 | + $this->mDb->insert( 'globalinterwiki', $insertions['globalinterwiki'], __METHOD__, 'IGNORE' ); |
| | 390 | + } |
| 385 | 391 | } |
| 386 | 392 | } |
| 387 | 393 | |
| — | — | @@ -484,7 +490,7 @@ |
| 485 | 491 | ); |
| 486 | 492 | $arr['globalinterwiki'][] = array( |
| 487 | 493 | 'giw_wikiid' => $wikiid, |
| 488 | | - 'giw_prefix' => $prefix |
| | 494 | + 'giw_prefix' => $prefix // FIXME: $prefix ix undefined |
| 489 | 495 | ); |
| 490 | 496 | $arr['globalnamespaces'][] = array( |
| 491 | 497 | 'gn_wiki' => wfWikiID( ), |