| Index: branches/querypage-work2/phase3/includes/db/Database.php |
| — | — | @@ -1619,24 +1619,24 @@ |
| 1620 | 1620 | $alias = $table; |
| 1621 | 1621 | } |
| 1622 | 1622 | // Is there a JOIN and INDEX clause for this table? |
| 1623 | | - if ( isset($join_conds_safe[$alias]) && isset($use_index_safe[$alias]) ) { |
| | 1623 | + if ( isset( $join_conds_safe[$alias] ) && isset( $use_index_safe[$alias] ) ) { |
| 1624 | 1624 | $tableClause = $join_conds_safe[$alias][0] . ' ' . $this->tableNameWithAlias( $table, $alias ); |
| 1625 | 1625 | $tableClause .= ' ' . $this->useIndexClause( implode( ',', (array)$use_index_safe[$alias] ) ); |
| 1626 | | - $on = $this->makeList((array)$join_conds_safe[$alias][1], LIST_AND); |
| | 1626 | + $on = $this->makeList( (array)$join_conds_safe[$alias][1], LIST_AND ); |
| 1627 | 1627 | if ( $on != '' ) { |
| 1628 | 1628 | $tableClause .= ' ON (' . $on . ')'; |
| 1629 | 1629 | } |
| 1630 | 1630 | |
| 1631 | 1631 | $retJOIN[] = $tableClause; |
| 1632 | 1632 | // Is there an INDEX clause? |
| 1633 | | - } else if ( isset($use_index_safe[$alias]) ) { |
| | 1633 | + } else if ( isset( $use_index_safe[$alias] ) ) { |
| 1634 | 1634 | $tableClause = $this->tableNameWithAlias( $table, $alias ); |
| 1635 | 1635 | $tableClause .= ' ' . $this->useIndexClause( implode( ',', (array)$use_index_safe[$alias] ) ); |
| 1636 | 1636 | $ret[] = $tableClause; |
| 1637 | 1637 | // Is there a JOIN clause? |
| 1638 | | - } else if ( isset($join_conds_safe[$alias]) ) { |
| | 1638 | + } else if ( isset( $join_conds_safe[$alias] ) ) { |
| 1639 | 1639 | $tableClause = $join_conds_safe[$alias][0] . ' ' . $this->tableNameWithAlias( $table, $alias ); |
| 1640 | | - $on = $this->makeList((array)$join_conds_safe[$alias][1], LIST_AND); |
| | 1640 | + $on = $this->makeList( (array)$join_conds_safe[$alias][1], LIST_AND ); |
| 1641 | 1641 | if ( $on != '' ) { |
| 1642 | 1642 | $tableClause .= ' ON (' . $on . ')'; |
| 1643 | 1643 | } |