From a204303e5099dcb88e5e4760a09e7de9a96c4ea3 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 17 Oct 2014 08:05:51 -0400
Subject: [PATCH] moved "function send_notification_email" from 300-quota_notify.inc.php to monitor_tools.inc.php
---
server/lib/classes/db_mysql.inc.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 4913479..e6600e9 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -269,11 +269,11 @@
}
public function queryOne($sQuery = '') {
- return $this->query_one($sQuery);
+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
}
public function query_one($sQuery = '') {
- return $this->queryOneRecord($sQuery);
+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
}
/**
@@ -302,11 +302,11 @@
}
public function queryAll($sQuery = '') {
- return $this->queryAllRecords($sQuery);
+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
}
public function query_all($sQuery = '') {
- return $this->queryAllRecords($sQuery);
+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
}
/**
@@ -335,7 +335,7 @@
}
public function query_all_array($sQuery = '') {
- return $this->queryAllArray($sQuery);
+ return call_user_func_array(array(&$this, 'queryAllArray'), func_get_args());
}
@@ -424,7 +424,7 @@
if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $sErrormsg . $sAddMsg;
} else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($sErrormsg . $sAddMsg, LOGLEVEL_WARN);
+ $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
}
}
--
Gitblit v1.9.1