aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/profile.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-04-15 17:32:12 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-04-15 17:32:12 +0000
commiteecdd3049f42166975864d2c1eb359ba09c9c229 (patch)
tree8e00f37521efd8c2a0eaf228dab6282742ef3a7e /phpBB/profile.php
parentcbafa0db4ebb54217a222c86a3083f0244c0ec3b (diff)
downloadforums-eecdd3049f42166975864d2c1eb359ba09c9c229.tar
forums-eecdd3049f42166975864d2c1eb359ba09c9c229.tar.gz
forums-eecdd3049f42166975864d2c1eb359ba09c9c229.tar.bz2
forums-eecdd3049f42166975864d2c1eb359ba09c9c229.tar.xz
forums-eecdd3049f42166975864d2c1eb359ba09c9c229.zip
error_die changes and various bug fixes to files
git-svn-id: file:///svn/phpbb/trunk@149 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/profile.php')
-rw-r--r--phpBB/profile.php20
1 files changed, 6 insertions, 14 deletions
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 0fea4b54a2..34c21f4c46 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -98,15 +98,7 @@ switch($mode)
}
else
{
- if(DEBUG)
- {
- $db_error = $db->sql_error();
- error_die($db, GENERAL_ERROR, "Error getting next user ID.<br>Reason: ".$db_error["message"]."<br>Line: ".__LINE__."<br>File: ".__FILE__);
- }
- else
- {
- error_die($db, QUERY_ERROR);
- }
+ error_die(SQL_QUERY, "Couldn't obtained next user_id information.", __LINE__, __FILE__);
}
$md_pass = md5($password);
@@ -189,7 +181,7 @@ switch($mode)
{
mail($email, $l_welcomesubj, $email_msg, "From: $email_from\r\n");
}
- error_die($db, GENERAL_ERROR, $msg);
+ error_die(GENERAL_ERROR, $msg);
}
else
{
@@ -284,21 +276,21 @@ switch($mode)
$sql_update = "UPDATE ".USERS_TABLE." SET user_active = 1, user_actkey = '' WHERE user_id = ".$rowset[0]["user_id"];
if($result = $db->sql_query($sql_update))
{
- error_die($db, GENERAL_ERROR, $l_nowactive);
+ error_die(GENERAL_ERROR, $l_nowactive);
}
else
{
- error_die($db, QUERY_ERROR);
+ error_die(SQL_QUERY);
}
}
else
{
- error_die($db, GENERAL_ERROR, $l_wrongactiv);
+ error_die(GENERAL_ERROR, $l_wrongactiv);
}
}
else
{
- error_die($db, QUERY_ERROR);
+ error_die(SQL_QUERY);
}
break;
}