X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=install-utils.inc;h=1fb2cc8e82b9fb7f19398fea264b17d2d61fad61;hb=b03ce013519563e5839d81ddac633e2a011e680b;hp=608c6abcd5132452c05a7ab51440a082e1331cbb;hpb=3c216b0c5b8fe8bf8e028c9cf3108dfeff7c1a84;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install-utils.inc b/install-utils.inc
index 608c6abcd5..1fb2cc8e82 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,8 +1,9 @@
 <?php
 
 function install_version_checks() {
-	# Turn off output buffering if it's on
-	@ob_end_flush();
+	# We dare not turn output buffer _off_ since this will break completely
+	# if PHP is globally configured to run through a gzip filter.
+	@ob_implicit_flush( true );
 	
 	if( !function_exists( "version_compare" ) ) {
 		# version_compare was introduced in 4.1.0
@@ -55,14 +56,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",
@@ -113,7 +118,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();
 			}
 
@@ -127,10 +133,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;