From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 4 May 2009 18:35:49 +0000 (+0000)
Subject: * (bug 6802) profileinfo.php now also work on other database servers than MySQL
X-Git-Tag: 1.31.0-rc.0~41885
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/message.php?a=commitdiff_plain;h=fe535c030df24db2f280a74e0ff350e27bb1d4d5;p=lhc%2Fweb%2Fwiklou.git

* (bug 6802) profileinfo.php now also work on other database servers than MySQL

Based on patches by Robert Treat (http://bug-attachment.wikimedia.org/attachment.cgi?id=2311) and Karun Dambiec (http://bug-attachment.wikimedia.org/attachment.cgi?id=6083)
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a1ddd465cb..cf44aee917 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -113,6 +113,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   possible.
 * (bug 18677) Give proper error message when viewing &action=protect without
   sufficient rights
+* (bug 6802) profileinfo.php now also work on other database servers than MySQL
 
 
 == API changes in 1.16 ==
diff --git a/profileinfo.php b/profileinfo.php
index d1cf853632..6056433786 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -1,13 +1,10 @@
 <?php
 ini_set( 'zlib.output_compression', 'off' );
 
-$wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgDBprefix = false;
 $wgEnableProfileInfo = $wgProfileToDatabase = false;
 
-define( 'MW_NO_SETUP', 1 );
 require_once( './includes/WebStart.php' );
 @include_once( './AdminSettings.php' );
-require_once( './includes/GlobalFunctions.php' );
 
 ?>
 <!--
@@ -73,13 +70,6 @@ if (!$wgEnableProfileInfo) {
 	exit( 1 );
 }
 
-foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var)
-	if ($$var === false) {
-		echo "AdminSettings.php not correct\n";
-		exit( 1 );
-	}
-
-
 $expand = array();
 if (isset($_REQUEST['expand']))
 	foreach(explode(",", $_REQUEST['expand']) as $f)
@@ -219,14 +209,9 @@ $sort = 'time';
 if (isset($_REQUEST['sort']) && in_array($_REQUEST['sort'], $sorts))
 	$sort = $_REQUEST['sort'];
 
-$dbh = mysql_connect($wgDBserver, $wgDBadminuser, $wgDBadminpassword)
-	or die("mysql server failed: " . mysql_error());
-mysql_select_db($wgDBname, $dbh) or die(mysql_error($dbh));
-$res = mysql_query("
-	SELECT pf_count, pf_time, pf_memory, pf_name
-	FROM {$wgDBprefix}profiling
-	ORDER BY pf_name ASC
-", $dbh) or die("query failed: " . mysql_error());
+
+$dbr = wfGetDB( DB_SLAVE );
+$res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) );
 
 if (isset($_REQUEST['filter']))
 	$filter = $_REQUEST['filter'];
@@ -276,7 +261,7 @@ $queries = array();
 $sqltotal = 0.0;
 
 $last = false;
-while (($o = mysql_fetch_object($res)) !== false) {
+foreach( $res as $o ) {
 	$next = new profile_point($o->pf_name, $o->pf_count, $o->pf_time, $o->pf_memory);
 	if( $next->name() == '-total' ) {
 		$totaltime = $next->time();
@@ -318,8 +303,7 @@ foreach ($points as $point) {
 <p>Total memory: <tt><?php printf("%5.02f", $totalmemory / 1024 ) ?></tt></p>
 <?php
 
-mysql_free_result($res);
-mysql_close($dbh);
+$res->free();
 
 ?>
 </body>