| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -101,6 +101,10 @@ |
| 102 | 102 | without reloading the page |
| 103 | 103 | * (bug 29325) Setting $wgStrictFileExtensions to false gives incorrect warning |
| 104 | 104 | * (bug 29437) Multiple apostrophes in deleted article title cause odd rendering |
| | 105 | +* (bug 29485) RSS feed of Special:RecentChange grouped together multiple |
| | 106 | + consecutive edits by same user in included diff, but then linked to |
| | 107 | + a single ungrouped diff. |
| | 108 | +* Do not try to group together a page creation and edit in the RSS feed of RC. |
| 105 | 109 | |
| 106 | 110 | === API changes in 1.19 === |
| 107 | 111 | * BREAKING CHANGE: action=watch now requires POST and token. |
| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -149,6 +149,7 @@ |
| 150 | 150 | $n = 0; |
| 151 | 151 | foreach( $rows as $obj ) { |
| 152 | 152 | if( $n > 0 && |
| | 153 | + $obj->rc_type == RC_EDIT && |
| 153 | 154 | $obj->rc_namespace >= 0 && |
| 154 | 155 | $obj->rc_cur_id == $sorted[$n-1]->rc_cur_id && |
| 155 | 156 | $obj->rc_user_text == $sorted[$n-1]->rc_user_text ) { |
| — | — | @@ -164,10 +165,21 @@ |
| 165 | 166 | $talkpage = MWNamespace::canTalk( $obj->rc_namespace ) ? $title->getTalkPage()->getFullUrl() : ''; |
| 166 | 167 | // Skip items with deleted content (avoids partially complete/inconsistent output) |
| 167 | 168 | if( $obj->rc_deleted ) continue; |
| | 169 | + |
| | 170 | + if ( $obj->rc_this_oldid ) { |
| | 171 | + $url = $title->getFullURL( |
| | 172 | + 'diff=' . $obj->rc_this_oldid . |
| | 173 | + '&oldid=' . $obj->rc_last_oldid |
| | 174 | + ); |
| | 175 | + } else { |
| | 176 | + // log entry or something like that. |
| | 177 | + $url = $title->getFullURL(); |
| | 178 | + } |
| | 179 | + |
| 168 | 180 | $item = new FeedItem( |
| 169 | 181 | $title->getPrefixedText(), |
| 170 | 182 | FeedUtils::formatDiff( $obj ), |
| 171 | | - $obj->rc_this_oldid ? $title->getFullURL( 'diff=' . $obj->rc_this_oldid . '&oldid=prev' ) : $title->getFullURL(), |
| | 183 | + $url, |
| 172 | 184 | $obj->rc_timestamp, |
| 173 | 185 | ($obj->rc_deleted & Revision::DELETED_USER) ? wfMsgHtml('rev-deleted-user') : $obj->rc_user_text, |
| 174 | 186 | $talkpage |