aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/db/dbal.php')
-rw-r--r--phpBB/includes/db/dbal.php12
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));