From 94eb70b5296b40418bcf20214fb36ab7af2d3585 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 4 Oct 2006 07:14:56 +0000 Subject: [PATCH] No setup, no wfDie(). You can't have it both ways. --- profileinfo.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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']; -- 2.20.1