diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-07-12 23:21:57 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-07-12 23:21:57 +0000 |
| commit | 5bf6bc18801a7b0ead230b20060bf20c52edb99f (patch) | |
| tree | ff1a86a246461ce1910ebf1fc84f6b6722455b95 /phpBB/includes/db/dbal.php | |
| parent | 44b78d7c8dcb8026d4bb7f3bca0c78e93027a2ac (diff) | |
| download | forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.gz forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.bz2 forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.tar.xz forums-5bf6bc18801a7b0ead230b20060bf20c52edb99f.zip | |
- 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
Diffstat (limited to 'phpBB/includes/db/dbal.php')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 12 |
1 files changed, 11 insertions, 1 deletions
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)); |