| Index: trunk/phase3/includes/installer/DatabaseInstaller.php |
| — | — | @@ -398,8 +398,9 @@ |
| 399 | 399 | foreach( $rows as $row ) { |
| 400 | 400 | $row = preg_replace( '/^\s*([^#]*?)\s*(#.*)?$/', '\\1', $row ); // strip comments - whee |
| 401 | 401 | if ( $row == "" ) continue; |
| | 402 | + $row .= "||"; |
| 402 | 403 | $interwikis[] = array_combine( |
| 403 | | - array( 'iw_prefix', 'iw_url', 'iw_local' ), |
| | 404 | + array( 'iw_prefix', 'iw_url', 'iw_local', 'iw_api', 'iw_wikiid' ), |
| 404 | 405 | explode( '|', $row ) |
| 405 | 406 | ); |
| 406 | 407 | } |
| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -2,12 +2,12 @@ |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Class for the core installer command line interface. |
| 6 | | - * |
| | 6 | + * |
| 7 | 7 | * @ingroup Deployment |
| 8 | 8 | * @since 1.17 |
| 9 | 9 | */ |
| 10 | 10 | class CliInstaller extends CoreInstaller { |
| 11 | | - |
| | 11 | + |
| 12 | 12 | private $optionMap = array( |
| 13 | 13 | 'dbtype' => 'wgDBtype', |
| 14 | 14 | 'dbserver' => 'wgDBserver', |
| — | — | @@ -78,6 +78,9 @@ |
| 79 | 79 | array( $this, 'startStage' ), |
| 80 | 80 | array( $this, 'endStage' ) |
| 81 | 81 | ); |
| | 82 | + |
| | 83 | + $ls = new LocalSettingsGenerator( $this ); |
| | 84 | + file_put_contents( "LocalSettings.php", $ls->getText() ); |
| 82 | 85 | } |
| 83 | 86 | |
| 84 | 87 | public function startStage( $step ) { |
| Index: trunk/phase3/maintenance/parserTests.inc |
| — | — | @@ -673,21 +673,33 @@ |
| 674 | 674 | $db->insert( 'interwiki', array( |
| 675 | 675 | array( 'iw_prefix' => 'wikipedia', |
| 676 | 676 | 'iw_url' => 'http://en.wikipedia.org/wiki/$1', |
| | 677 | + 'iw_api' => '', |
| | 678 | + 'iw_wikiid' => '', |
| 677 | 679 | 'iw_local' => 0 ), |
| 678 | 680 | array( 'iw_prefix' => 'meatball', |
| 679 | 681 | 'iw_url' => 'http://www.usemod.com/cgi-bin/mb.pl?$1', |
| | 682 | + 'iw_api' => '', |
| | 683 | + 'iw_wikiid' => '', |
| 680 | 684 | 'iw_local' => 0 ), |
| 681 | 685 | array( 'iw_prefix' => 'zh', |
| 682 | 686 | 'iw_url' => 'http://zh.wikipedia.org/wiki/$1', |
| | 687 | + 'iw_api' => '', |
| | 688 | + 'iw_wikiid' => '', |
| 683 | 689 | 'iw_local' => 1 ), |
| 684 | 690 | array( 'iw_prefix' => 'es', |
| 685 | 691 | 'iw_url' => 'http://es.wikipedia.org/wiki/$1', |
| | 692 | + 'iw_api' => '', |
| | 693 | + 'iw_wikiid' => '', |
| 686 | 694 | 'iw_local' => 1 ), |
| 687 | 695 | array( 'iw_prefix' => 'fr', |
| 688 | 696 | 'iw_url' => 'http://fr.wikipedia.org/wiki/$1', |
| | 697 | + 'iw_api' => '', |
| | 698 | + 'iw_wikiid' => '', |
| 689 | 699 | 'iw_local' => 1 ), |
| 690 | 700 | array( 'iw_prefix' => 'ru', |
| 691 | 701 | 'iw_url' => 'http://ru.wikipedia.org/wiki/$1', |
| | 702 | + 'iw_api' => '', |
| | 703 | + 'iw_wikiid' => '', |
| 692 | 704 | 'iw_local' => 1 ), |
| 693 | 705 | ) ); |
| 694 | 706 | |