projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple of smaller fixes.
[fa-stable.git]
/
includes
/
db
/
connect_db.inc
diff --git
a/includes/db/connect_db.inc
b/includes/db/connect_db.inc
index 060637bc87c147f1d394c92c106a36c80cf9d40b..5babac1bd4f3676bd5f6d2874df2e37cb6ca736f 100644
(file)
--- a/
includes/db/connect_db.inc
+++ b/
includes/db/connect_db.inc
@@
-12,7
+12,10
@@
function set_global_connection()
{
function set_global_connection()
{
- global $db;
+ global $db, $transaction_level;
+
+ cancel_transaction(); // cancel all aborted transactions if any
+ $transaction_level = 0;
$db = $_SESSION["wa_current_user"]->get_db_connection();
}
$db = $_SESSION["wa_current_user"]->get_db_connection();
}
@@
-23,16
+26,13
@@
$db_duplicate_error_code = 1062;
function db_query($sql, $err_msg=null)
{
function db_query($sql, $err_msg=null)
{
- global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+ global $db, $show_sql, $sql_trail, $select_trail, $go_debug
, $sql_queries, $Ajax
;
if ($show_sql)
{
if ($show_sql)
{
- echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
- echo "<pre>";
- echo $sql;
- echo "</pre>\n";
+ $Ajax->activate('footer_debug');
+ $sql_queries .= "<pre>$sql</pre>\n<hr>";
}
}
-
$result = mysql_query($sql, $db);
if($sql_trail) {
$result = mysql_query($sql, $db);
if($sql_trail) {
@@
-84,7
+84,7
@@
function db_free_result ($result)
mysql_free_result($result);
}
mysql_free_result($result);
}
-function db_num_rows (
&
$result)
+function db_num_rows ($result)
{
return mysql_num_rows($result);
}
{
return mysql_num_rows($result);
}