http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70017
Revision: 70017
Author: reedy
Date: 2010-07-27 15:49:48 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Remove some pre 1.15.999 compatability stuff (1.16 is due to be released, and
we're working on 1.17)
Modified Paths:
--------------
trunk/extensions/LiquidThreads/classes/NewMessagesController.php
Modified: trunk/extensions/LiquidThreads/classes/NewMessagesController.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/NewMessagesController.php
2010-07-27 15:44:59 UTC (rev 70016)
+++ trunk/extensions/LiquidThreads/classes/NewMessagesController.php
2010-07-27 15:49:48 UTC (rev 70017)
@@ -108,8 +108,7 @@
}
private static function getRowsObject( $t ) {
- // <= 1.15 compatibility, it kinda sucks having to do all this
up here.
- $tables = array( 'watchlist', 'user_message_state' );
+ $tables = array( 'watchlist', 'user_message_state',
'user_properties' );
$joins = array(
'user_message_state' =>
array(
@@ -118,28 +117,17 @@
'ums_user=wl_user',
'ums_thread' => $t->id()
)
- )
- );
- $fields = array( 'wl_user', 'ums_user', 'ums_read_timestamp' );
-
- global $wgVersion;
- if ( version_compare( $wgVersion, '1.15.999', '<=' ) ) {
- $oldPrefCompat = true;
-
- $tables[] = 'user';
- $joins['user'] = array( 'left join', 'user_id=wl_user'
);
- $fields[] = 'user_options';
- } else {
- $tables[] = 'user_properties';
- $joins['user_properties'] = array(
+ ),
+ 'user_properties' =>
+ array(
'left join',
array(
'up_user=wl_user',
'up_property' => 'lqtnotifytalk',
)
- );
- $fields[] = 'up_value';
- }
+ )
+ );
+ $fields = array( 'wl_user', 'ums_user', 'ums_read_timestamp',
'up_value' );
$dbr = wfGetDB( DB_SLAVE );
return $dbr->select( $tables, $fields, self::getWhereClause( $t
), __METHOD__, array(), $joins );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
