X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=install-utils.inc;h=34dd701762ae998a85095c98fa3a3f01287cee88;hb=2a2ef856f78cf1f420a52288a46b6a4a77e501be;hp=55e712c9241c9ccab9d365dc10c90967d5fed2b2;hpb=9e53bfc81c11a5880291e0c4ac3e84d84ad3f821;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install-utils.inc b/install-utils.inc
index 55e712c924..34dd701762 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,6 +1,9 @@
 <?php
 
 function install_version_checks() {
+	# Turn off output buffering if it's on
+	@ob_end_flush();
+	
 	if( !function_exists( "version_compare" ) ) {
 		# version_compare was introduced in 4.1.0
 		die( "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is recommended. ABORTING.\n" );
@@ -52,14 +55,18 @@ function copydirectory( $source, $dest ) {
 	}
 }
 
-function readconsole() {
-	$fp = fopen( "php://stdin", "r" );
-	$resp = trim( fgets( $fp, 1024 ) );
-	fclose( $fp );
-	return $resp;
+function readconsole( $prompt = "" ) {
+	if ( function_exists( "readline" ) ) {
+		return readline( $prompt );
+	} else {
+		print $prompt;
+		$fp = fopen( "php://stdin", "r" );
+		$resp = trim( fgets( $fp, 1024 ) );
+		fclose( $fp );
+		return $resp;
+	}
 }
 
-
 function replacevars( $ins ) {
 	$varnames = array(
 		"wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
@@ -110,7 +117,8 @@ function dbsource( $fname, $database = false ) {
 				$res = mysql_query( $cmd );
 
 			if ( false === $res ) {
-				print "Query \"{$cmd}\" failed.\n";
+				$err = mysql_error();
+				print "Query \"{$cmd}\" failed with error code \"$err\".\n";
 				exit();
 			}
 
@@ -124,10 +132,11 @@ function dbsource( $fname, $database = false ) {
 # Obsolete, use Database::fieldExists()
 function field_exists( $table, $field ) {
 	$fname = "Update script: field_exists";
-	$res = wfQuery( "DESCRIBE $table", $fname );
+	$db =& wfGetDB( DB_SLAVE );
+	$res = $db->query( "DESCRIBE $table", $fname );
 	$found = false;
 	
-	while ( $row = wfFetchObject( $res ) ) {
+	while ( $row = $db->fetchObject( $res ) ) {
 		if ( $row->Field == $field ) {
 			$found = true;
 			break;