| Index: trunk/extensions/IndexFunction/SpecialIndex.php |
| — | — | @@ -134,20 +134,13 @@ |
| 135 | 135 | array( 'page' => array('JOIN','page_id=in_from') ) |
| 136 | 136 | ); |
| 137 | 137 | |
| 138 | | - $union = $this->unionQueries( array( $pagequery, $indexquery ), false ); |
| | 138 | + $union = $this->mDb->unionQueries( array( $pagequery, $indexquery ), false ); |
| 139 | 139 | $union .= $order . $limit; |
| 140 | 140 | |
| 141 | 141 | $res = $this->mDb->query( $union, __METHOD__ ); |
| 142 | 142 | return new ResultWrapper( $this->mDb, $res ); |
| 143 | 143 | } |
| 144 | | - |
| 145 | | - // Copied from Database.php on MW trunk |
| 146 | | - function unionQueries($sqls, $all) { |
| 147 | | - $glue = $all ? ') UNION ALL (' : ') UNION ('; |
| 148 | | - return '('.implode( $glue, $sqls ) . ')'; |
| 149 | | - } |
| 150 | 144 | |
| 151 | | - |
| 152 | 145 | } |
| 153 | 146 | |
| 154 | 147 | class SpecialIndex extends SpecialPage { |