aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-02-25 01:23:32 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-02-25 01:23:32 +0000
commit79612d540e2ab4ac4deaac741d7132e0f41b95c9 (patch)
treece656b8d44d8bdd2cb5b311a7e8a2b9b32837446
parentead4422667100b087c68b95164185feffc43336c (diff)
downloadforums-79612d540e2ab4ac4deaac741d7132e0f41b95c9.tar
forums-79612d540e2ab4ac4deaac741d7132e0f41b95c9.tar.gz
forums-79612d540e2ab4ac4deaac741d7132e0f41b95c9.tar.bz2
forums-79612d540e2ab4ac4deaac741d7132e0f41b95c9.tar.xz
forums-79612d540e2ab4ac4deaac741d7132e0f41b95c9.zip
Aded GENERAL_ERROR to constants
git-svn-id: file:///svn/phpbb/trunk@57 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/config.php7
-rw-r--r--phpBB/db.php3
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/config.php b/phpBB/config.php
index e5f6eb26fb..59bf08ca93 100644
--- a/phpBB/config.php
+++ b/phpBB/config.php
@@ -61,6 +61,7 @@ define(BANNED, 2);
define(QUERY_ERROR, 3);
define(SESSION_CREATE, 4);
define(NO_TOPICS, 5);
+define(GENERAL_ERROR, 6);
// Session data
$session_cookie = "phpBBsession";
@@ -69,9 +70,9 @@ $session_cookie_time = 3600;
// DB connection config
$dbms = "mysql";
$dbhost = "localhost";
-$dbname = "phpbb";
-$dbuser = "iamstillanidiot";
-$dbpasswd = "iamstillanidiotspassword";
+$dbname = "";
+$dbuser = "";
+$dbpasswd = "";
// Date format (needs to go into DB)
$date_format = "M d, Y h:i:s a";
diff --git a/phpBB/db.php b/phpBB/db.php
index 2a4dc39d79..0571735aa8 100644
--- a/phpBB/db.php
+++ b/phpBB/db.php
@@ -41,6 +41,7 @@ switch($dbms)
$db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
if(!$db)
{
- error_die($db, SQL_CONNECT);
+ $db_error = $db->sql_error();
+ error_die($db, SQL_CONNECT, $db_error["message"]);
}
?>