aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-28 15:04:59 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-28 15:04:59 +0000
commit26befa094147b542e48e36867eb41eaf424225f7 (patch)
tree5131952196ff19744498bbbdc962635cecc94c4f /phpBB/includes/db
parent67accdb07263030c29eebba9edf944fd350879d1 (diff)
downloadforums-26befa094147b542e48e36867eb41eaf424225f7.tar
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.gz
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.bz2
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.xz
forums-26befa094147b542e48e36867eb41eaf424225f7.zip
- added confirmation to removing bbcodes
- added optional MX and DNSBL checks - added backtrace (triggering sql error) on error within sql_in_set as well as making sure it is handling an array - let users having f_list access to a forum actually see the forum without a topic list and not displaying an error message - this allows for giving people access to subforums but not the parent forum without the need to add the (sub-)forum to the index. - some additional bugfixes git-svn-id: file:///svn/phpbb/trunk@6414 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/dbal.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 6e89c6f908..5dedc3e940 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -238,7 +238,13 @@ class dbal
{
if (!sizeof($array))
{
- trigger_error('No values specified for SQL IN comparison', E_USER_ERROR);
+ // Not optimal, but at least the backtrace should help in identifying where the problem lies.
+ $this->sql_error('No values specified for SQL IN comparison');
+ }
+
+ if (!is_array($array))
+ {
+ $array = array($array);
}
$values = array();