X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=5ac36a3b5fcc86ca2f6155e25e4e715d1accb7c0;hb=d7b26b0a9bfb6c894d15a5ff80b000df25188428;hp=229fe10b9d631ba18e59a5c66aa0b9377d735fd5;hpb=628ac800da5b09fd96a3578a68418e99ab7449b6;p=wfpl.git

diff --git a/db.php b/db.php
index 229fe10..5ac36a3 100644
--- a/db.php
+++ b/db.php
@@ -64,9 +64,10 @@ function db_connect_now($database = 'auto', $user = 'auto', $pass = 'auto', $hos
 		}
 	}
 
-	$GLOBALS['wfpl_db_handle'] = mysqli_connect($host, $user, $pass);
+	$GLOBALS['wfpl_db_handle'] = @mysqli_connect($host, $user, $pass);
 	if(!$GLOBALS['wfpl_db_handle']) {
-		die('Could not connect to the database: ' . mysqli_error());
+		die('Server error: Database connection failed');
+		# to show username and host: mysqli_connect_error()
 	}
 
 	mysqli_set_charset($GLOBALS['wfpl_db_handle'], $encoding);
@@ -83,7 +84,7 @@ function _db_connection_needed() {
 		return;
 	}
 	if (isset($GLOBALS['wfpl_db_connect_args'])) {
-		return call_user_func_array(db_connect_now, $GLOBALS['wfpl_db_connect_args']);
+		return call_user_func_array('db_connect_now', $GLOBALS['wfpl_db_connect_args']);
 	}
 	die('Error: you must call db_connect() or db_auto_connect() first!');
 }