X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabase.php;h=c04e16773886b5efb27b7f942287f6316893ce95;hp=bc1454baec765907be2b4f47f22a75dbc14d0c93;hb=d94c0484302f80cf30ef107b2fdb6b84293e1937;hpb=6f4eda1fd3e4f592c30b4b8a86bac53301eaec9f

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index bc1454baec..c04e167738 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2015,11 +2015,21 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				// No alias? Set it equal to the table name
 				$alias = $table;
 			}
+
+			if ( is_array( $table ) ) {
+				// A parenthesized group
+				$joinedTable = '('
+					. $this->tableNamesWithIndexClauseOrJOIN( $table, $use_index, $ignore_index, $join_conds )
+					. ')';
+			} else {
+				$joinedTable = $this->tableNameWithAlias( $table, $alias );
+			}
+
 			// Is there a JOIN clause for this table?
 			if ( isset( $join_conds[$alias] ) ) {
 				list( $joinType, $conds ) = $join_conds[$alias];
 				$tableClause = $joinType;
-				$tableClause .= ' ' . $this->tableNameWithAlias( $table, $alias );
+				$tableClause .= ' ' . $joinedTable;
 				if ( isset( $use_index[$alias] ) ) { // has USE INDEX?
 					$use = $this->useIndexClause( implode( ',', (array)$use_index[$alias] ) );
 					if ( $use != '' ) {
@@ -2041,7 +2051,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				$retJOIN[] = $tableClause;
 			} elseif ( isset( $use_index[$alias] ) ) {
 				// Is there an INDEX clause for this table?
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 				$tableClause .= ' ' . $this->useIndexClause(
 						implode( ',', (array)$use_index[$alias] )
 					);
@@ -2049,14 +2059,14 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				$ret[] = $tableClause;
 			} elseif ( isset( $ignore_index[$alias] ) ) {
 				// Is there an INDEX clause for this table?
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 				$tableClause .= ' ' . $this->ignoreIndexClause(
 						implode( ',', (array)$ignore_index[$alias] )
 					);
 
 				$ret[] = $tableClause;
 			} else {
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 
 				$ret[] = $tableClause;
 			}