From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 23 Apr 2004 12:36:05 +0000 (+0000)
Subject: + fix notices with $argv
X-Git-Tag: 1.3.0beta1~316
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=b6df642432a967e63fdfe20124b153518c3c7614;p=lhc%2Fweb%2Fwiklou.git

+ fix notices with $argv
+ disable buffering output (prevent text from not showing in win2k console)
Todo: notice about $IP not set
---

diff --git a/maintenance/rebuildMessages.php b/maintenance/rebuildMessages.php
index 58bcdc6024..d892f3717c 100755
--- a/maintenance/rebuildMessages.php
+++ b/maintenance/rebuildMessages.php
@@ -1,8 +1,10 @@
 <?php
 $wgCommandLineMode = true;
-
+# Turn off output buffering if it's on
+@ob_end_flush();
+	
 $sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-if ( $argv[1] ) {
+if ( isset($argv[1]) && $argv[1] ) {
 	$lang = $argv[1];
 	putenv( "wikilang=$lang");
 	$settingsFile = "/apache/htdocs/{$argv[1]}/w/LocalSettings.php";
@@ -12,9 +14,9 @@ if ( $argv[1] ) {
 	$newpath = "";
 }
 
-if ( $argv[2] == "update" ) {
+if ( isset($argv[2]) && $argv[2] == "update" ) {
 	$response = 1;
-} elseif ( $argv[2] == "reinitialise" ) {
+} elseif ( isset($argv[2]) && $argv[2] == "reinitialise" ) {
 	$response = 2;
 } else {
 	$response = 0;
@@ -39,7 +41,7 @@ $wgTitle = Title::newFromText( "Rebuild messages script" );
 $wgCommandLineMode = true;
 set_time_limit(0);
 
-if ( count( $argv ) >= 3 ) {
+if ( isset($argv) && count( $argv ) >= 3 ) {
 	$messages = loadArrayFromFile( $argv[3] );
 } else {
 	$messages = false;