Replaced all mysql_error by db_error except for the directory /install

This commit is contained in:
Dmitriy Simushev 2011-11-09 20:10:04 +00:00
parent 51f6af7ced
commit 3e5834983f
3 changed files with 7 additions and 7 deletions

View File

@ -386,12 +386,12 @@ function db_error($link)
function perform_query($query, $link) function perform_query($query, $link)
{ {
mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link)); mysql_query($query, $link) or die(' Query failed: ' . db_error($link));
} }
function select_one_row($query, $link) function select_one_row($query, $link)
{ {
$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link)); $result = mysql_query($query, $link) or die(' Query failed: ' . db_error($link));
$line = mysql_fetch_array($result, MYSQL_ASSOC); $line = mysql_fetch_array($result, MYSQL_ASSOC);
mysql_free_result($result); mysql_free_result($result);
return $line; return $line;
@ -399,7 +399,7 @@ function select_one_row($query, $link)
function select_multi_assoc($query, $link) function select_multi_assoc($query, $link)
{ {
$sqlresult = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link)); $sqlresult = mysql_query($query, $link) or die(' Query failed: ' . db_error($link));
$result = array(); $result = array();
while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) { while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) {
@ -419,7 +419,7 @@ function db_build_select($fields, $table, $conditions, $orderandgroup)
function db_rows_count($table, $conditions, $countfields, $link) function db_rows_count($table, $conditions, $countfields, $link)
{ {
$result = mysql_query(db_build_select("count(" . ($countfields ? $countfields : "*") . ")", $table, $conditions, ""), $link) $result = mysql_query(db_build_select("count(" . ($countfields ? $countfields : "*") . ")", $table, $conditions, ""), $link)
or die(' Count query failed: ' . mysql_error($link)); or die(' Count query failed: ' . db_error($link));
$line = mysql_fetch_array($result, MYSQL_NUM); $line = mysql_fetch_array($result, MYSQL_NUM);
mysql_free_result($result); mysql_free_result($result);
return $line[0]; return $line[0];
@ -684,7 +684,7 @@ function loadsettings_($link)
} }
$settingsloaded = true; $settingsloaded = true;
$sqlresult = mysql_query("select vckey,vcvalue from ${mysqlprefix}chatconfig", $link) or die(' Query failed: ' . mysql_error($link)); $sqlresult = mysql_query("select vckey,vcvalue from ${mysqlprefix}chatconfig", $link) or die(' Query failed: ' . db_error($link));
while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) { while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) {
$name = $row['vckey']; $name = $row['vckey'];

View File

@ -47,7 +47,7 @@ if (isset($_GET['act']) && $_GET['act'] == 'del') {
} }
$result = mysql_query("select banid,unix_timestamp(dtmtill) as till,address,comment from ${mysqlprefix}chatban", $link) $result = mysql_query("select banid,unix_timestamp(dtmtill) as till,address,comment from ${mysqlprefix}chatban", $link)
or die(' Query failed: ' . mysql_error($link)); or die(' Query failed: ' . db_error($link));
$blockedList = array(); $blockedList = array();
while ($ban = mysql_fetch_array($result, MYSQL_ASSOC)) { while ($ban = mysql_fetch_array($result, MYSQL_ASSOC)) {

View File

@ -50,7 +50,7 @@ function threads_by_userid($userid)
"from ${mysqlprefix}chatthread " . "from ${mysqlprefix}chatthread " .
"where userid=\"$userid\" order by created DESC", $userid); "where userid=\"$userid\" order by created DESC", $userid);
$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link)); $result = mysql_query($query, $link) or die(' Query failed: ' . db_error($link));
$foundThreads = array(); $foundThreads = array();
while ($thread = mysql_fetch_array($result, MYSQL_ASSOC)) { while ($thread = mysql_fetch_array($result, MYSQL_ASSOC)) {