http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70207
Revision: 70207
Author: mah
Date: 2010-07-30 20:17:28 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
* Make parsertests work with interwiki table on sqlite
* re r69542 temporary fix for new-installer + interwiki table
* temporary fix for outputing LocalSettings.php in the CliInstaller
Modified Paths:
--------------
trunk/phase3/includes/installer/CliInstaller.php
trunk/phase3/includes/installer/DatabaseInstaller.php
trunk/phase3/maintenance/parserTests.inc
Modified: trunk/phase3/includes/installer/CliInstaller.php
===================================================================
--- trunk/phase3/includes/installer/CliInstaller.php 2010-07-30 20:14:47 UTC
(rev 70206)
+++ trunk/phase3/includes/installer/CliInstaller.php 2010-07-30 20:17:28 UTC
(rev 70207)
@@ -2,12 +2,12 @@
/**
* Class for the core installer command line interface.
- *
+ *
* @ingroup Deployment
* @since 1.17
*/
class CliInstaller extends CoreInstaller {
-
+
private $optionMap = array(
'dbtype' => 'wgDBtype',
'dbserver' => 'wgDBserver',
@@ -78,6 +78,9 @@
array( $this, 'startStage' ),
array( $this, 'endStage' )
);
+
+ $ls = new LocalSettingsGenerator( $this );
+ file_put_contents( "LocalSettings.php", $ls->getText() );
}
public function startStage( $step ) {
Modified: trunk/phase3/includes/installer/DatabaseInstaller.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseInstaller.php 2010-07-30
20:14:47 UTC (rev 70206)
+++ trunk/phase3/includes/installer/DatabaseInstaller.php 2010-07-30
20:17:28 UTC (rev 70207)
@@ -398,8 +398,9 @@
foreach( $rows as $row ) {
$row = preg_replace( '/^\s*([^#]*?)\s*(#.*)?$/', '\\1',
$row ); // strip comments - whee
if ( $row == "" ) continue;
+ $row .= "||";
$interwikis[] = array_combine(
- array( 'iw_prefix', 'iw_url', 'iw_local' ),
+ array( 'iw_prefix', 'iw_url', 'iw_local',
'iw_api', 'iw_wikiid' ),
explode( '|', $row )
);
}
Modified: trunk/phase3/maintenance/parserTests.inc
===================================================================
--- trunk/phase3/maintenance/parserTests.inc 2010-07-30 20:14:47 UTC (rev
70206)
+++ trunk/phase3/maintenance/parserTests.inc 2010-07-30 20:17:28 UTC (rev
70207)
@@ -673,21 +673,33 @@
$db->insert( 'interwiki', array(
array( 'iw_prefix' => 'wikipedia',
'iw_url' =>
'http://en.wikipedia.org/wiki/$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 0 ),
array( 'iw_prefix' => 'meatball',
'iw_url' =>
'http://www.usemod.com/cgi-bin/mb.pl?$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 0 ),
array( 'iw_prefix' => 'zh',
'iw_url' =>
'http://zh.wikipedia.org/wiki/$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 1 ),
array( 'iw_prefix' => 'es',
'iw_url' =>
'http://es.wikipedia.org/wiki/$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 1 ),
array( 'iw_prefix' => 'fr',
'iw_url' =>
'http://fr.wikipedia.org/wiki/$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 1 ),
array( 'iw_prefix' => 'ru',
'iw_url' =>
'http://ru.wikipedia.org/wiki/$1',
+ 'iw_api' => '',
+ 'iw_wikiid' => '',
'iw_local' => 1 ),
) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
