| Index: branches/REL1_16/extensions/LiquidThreads/classes/NewMessagesController.php |
| — | — | @@ -267,25 +267,27 @@ |
| 268 | 268 | if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
| 269 | 269 | $oldPreferenceFormat = true; |
| 270 | 270 | } else { |
| 271 | | - $tables[] = 'user_properties as tc_prop'; |
| | 271 | + $tableNameUserProperties = $dbr->tableName( 'user_properties' ); |
| | 272 | + |
| | 273 | + $tables[] = $tableNameUserProperties . ' as tc_prop'; |
| 272 | 274 | $fields[] = 'tc_prop.up_value as timecorrection'; |
| 273 | 275 | |
| 274 | | - $join_conds['user_properties as tc_prop'] = array( |
| | 276 | + $join_conds[$tableNameUserProperties . ' as tc_prop'] = array( |
| 275 | 277 | 'left join', |
| 276 | 278 | array( |
| 277 | | - 'up_user=user_id', |
| 278 | | - 'up_property' => 'timecorrection', |
| | 279 | + 'tc_prop.up_user=user_id', |
| | 280 | + 'tc_prop.up_property' => 'timecorrection', |
| 279 | 281 | ) |
| 280 | 282 | ); |
| 281 | 283 | |
| 282 | | - $tables[] = 'user_properties as l_prop'; |
| | 284 | + $tables[] = $tableNameUserProperties . ' as l_prop'; |
| 283 | 285 | $fields[] = 'l_prop.up_value as language'; |
| 284 | 286 | |
| 285 | | - $join_conds['user_properties as l_prop'] = array( |
| | 287 | + $join_conds[$tableNameUserProperties . ' as l_prop'] = array( |
| 286 | 288 | 'left join', |
| 287 | 289 | array( |
| 288 | | - 'up_user=user_id', |
| 289 | | - 'up_property' => 'language', |
| | 290 | + 'l_prop.up_user=user_id', |
| | 291 | + 'l_prop.up_property' => 'language', |
| 290 | 292 | ) |
| 291 | 293 | ); |
| 292 | 294 | } |
| Property changes on: branches/REL1_16/extensions/LiquidThreads/classes/NewMessagesController.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 293 | 295 | + /trunk/extensions/LiquidThreads/classes/NewMessagesController.php:57390,62859,62886 |