| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /trunk/phase3/includes/api:48813-48814,48819,48836,48909,49051,49068,49086,49682,49775 |
| 2 | 2 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48909,48989,48992,49051,49068,49086,49682,49775 |
| Index: branches/REL1_15/phase3/includes/ChangesList.php |
| — | — | @@ -326,8 +326,7 @@ |
| 327 | 327 | $page = $rc->getTitle(); |
| 328 | 328 | /** Check for rollback and edit permissions, disallow special pages, and only |
| 329 | 329 | * show a link on the top-most revision */ |
| 330 | | - if( $page->quickUserCan('rollback') && $page->quickUserCan('edit') |
| 331 | | - && $page->getLatestRevID() == $rc->mAttribs['rc_this_oldid'] ) |
| | 330 | + if ($wgUser->isAllowed('rollback') && $rc->mAttribs['page_latest'] == $rc->mAttribs['rc_this_oldid'] ) |
| 332 | 331 | { |
| 333 | 332 | $rev = new Revision( array( |
| 334 | 333 | 'id' => $rc->mAttribs['rc_this_oldid'], |
| Index: branches/REL1_15/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -286,7 +286,10 @@ |
| 287 | 287 | $join_conds['watchlist'] = array('LEFT JOIN', |
| 288 | 288 | "wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace"); |
| 289 | 289 | } |
| 290 | | - |
| | 290 | + if ($wgUser->isAllowed("rollback")) { |
| | 291 | + $tables[] = 'page'; |
| | 292 | + $join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id'); |
| | 293 | + } |
| 291 | 294 | // Tag stuff. |
| 292 | 295 | $fields = array(); |
| 293 | 296 | // Fields are * in this case, so let the function modify an empty array to keep it happy. |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 294 | 297 | - /trunk/phase3/includes/specials:48836,48993,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials/specials:48993 |
| 295 | 298 | + /trunk/phase3/includes/specials:48836,48989,48992-48993,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 296 | 299 | - /trunk/phase3/includes:48836,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials:48993 |
| 297 | 300 | + /trunk/phase3/includes:48836,48989,48992,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials:48993 |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 298 | 301 | - /trunk/phase3:48814,48836,48909,49051,49068,49086,49682,49775 |
| 299 | 302 | + /trunk/phase3:48814,48836,48909,48989,48992,49051,49068,49086,49682,49775 |