From 5bf6bc18801a7b0ead230b20060bf20c52edb99f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 12 Jul 2006 23:21:57 +0000 Subject: - it's \r\n not \n\r [Bug #3121] - a few little search bugfixes - drop in the improved version of the native search based on UTF-8 (still needs some work before it can replace the current native search) Thanks Ashe :) git-svn-id: file:///svn/phpbb/trunk@6175 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/dbal.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/db/dbal.php') diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index ecfe71f1ef..e8cc69a553 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -286,7 +286,17 @@ class dbal $table_array = array(); foreach ($array['FROM'] as $table_name => $alias) { - $table_array[] = $table_name . ' ' . $alias; + if (is_array($alias)) + { + foreach ($alias as $multi_alias) + { + $table_array[] = $table_name . ' ' . $multi_alias; + } + } + else + { + $table_array[] = $table_name . ' ' . $alias; + } } $sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array)); -- cgit v1.2.1