From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 4 Oct 2006 07:14:56 +0000 (+0000)
Subject: No setup, no wfDie(). You can't have it both ways.
X-Git-Tag: 1.31.0-rc.0~55632
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=94eb70b5296b40418bcf20214fb36ab7af2d3585;p=lhc%2Fweb%2Fwiklou.git

No setup, no wfDie(). You can't have it both ways.
---

diff --git a/profileinfo.php b/profileinfo.php
index 388e0cdc09..4e2a3d76ac 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -51,12 +51,16 @@ require_once( './includes/WebStart.php' );
 require_once("./AdminSettings.php");
 
 if (!$wgEnableProfileInfo) {
-	wfDie("disabled");
+	echo "disabled\n";
+	exit( 1 );
 }
 
 foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var)
-	if ($$var === false)
-		wfDie("AdminSettings.php not correct");
+	if ($$var === false) {
+		echo "AdminSettings.php not correct\n";
+		exit( 1 );
+	}
+
 
 $expand = array();
 if (isset($_REQUEST['expand']))
@@ -150,13 +154,13 @@ if (isset($_REQUEST['sort']) && in_array($_REQUEST['sort'], $sorts))
 	$sort = $_REQUEST['sort'];
 
 $dbh = mysql_connect($wgDBserver, $wgDBadminuser, $wgDBadminpassword)
-	or wfDie("mysql server failed: " . mysql_error());
-mysql_select_db($wgDBname, $dbh) or wfDie(mysql_error($dbh));
+	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_name
 	FROM profiling
 	ORDER BY pf_name ASC
-", $dbh) or wfDie("query failed: " . mysql_error());
+", $dbh) or die("query failed: " . mysql_error());
 
 if (isset($_REQUEST['filter']))
 	$filter = $_REQUEST['filter'];