r50167 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50166‎ | r50167 | r50168 >
Date:09:29, 4 May 2009
Author:tstarling
Status:deferred
Tags:
Comment:
Backport r49002, prevents watchlist breakage in conjunction with already-backported r48989.
Modified paths:
  • /branches/REL1_15/phase3 (modified) (history)
  • /branches/REL1_15/phase3/includes (modified) (history)
  • /branches/REL1_15/phase3/includes/api (modified) (history)
  • /branches/REL1_15/phase3/includes/specials (modified) (history)
  • /branches/REL1_15/phase3/includes/specials/SpecialWatchlist.php (modified) (history)

Diff [purge]

Property changes on: branches/REL1_15/phase3/includes/api
___________________________________________________________________
Name: svn:mergeinfo
11 - /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
22 + /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
Index: branches/REL1_15/phase3/includes/specials/SpecialWatchlist.php
@@ -214,9 +214,12 @@
215215 if( $andHidePatrolled ) $conds[] = $andHidePatrolled;
216216 if( $nameSpaceClause ) $conds[] = $nameSpaceClause;
217217
218 - if ( $usePage ) {
 218+ $rollbacker = $wgUser->isAllowed('rollback');
 219+ if ( $usePage || $rollbacker ) {
219220 $tables[] = 'page';
220221 $join_conds['page'] = array('LEFT JOIN','rc_cur_id=page_id');
 222+ if ($rollbacker)
 223+ $fields[] = 'page_latest';
221224 }
222225
223226 ChangeTags::modifyDisplayQuery( $tables, $fields, $conds, $join_conds, $options, '' );
Property changes on: branches/REL1_15/phase3/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
224227 - /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
/trunk/phase3/includes/specials/specials:48993
225228 + /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
/trunk/phase3/includes/specials/specials:48993
Property changes on: branches/REL1_15/phase3/includes
___________________________________________________________________
Name: svn:mergeinfo
226229 - /trunk/phase3/includes:48836,48886,48892,48989,48992,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
/trunk/phase3/includes/specials:48993
227230 + /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
/trunk/phase3/includes/specials:48993
Property changes on: branches/REL1_15/phase3
___________________________________________________________________
Name: svn:mergeinfo
228231 - /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070
229232 + /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49682,49685,49730,49775,50070

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r48989fix some of RC rollback madness:...midom11:02, 29 March 2009
r49002fix rollback links in watchlists, use a join'ed `page` for thatmidom14:18, 29 March 2009

Status & tagging log