| Index: trunk/phase3/includes/HistoryPage.php |
| — | — | @@ -216,8 +216,9 @@ |
| 217 | 217 | $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ), |
| 218 | 218 | $this->title->getFullUrl(), |
| 219 | 219 | wfTimestamp( TS_MW ), |
| 220 | | - '', |
| 221 | | - $this->title->getTalkPage()->getFullUrl() ); |
| | 220 | + '', |
| | 221 | + $this->title->getTalkPage()->getFullUrl() |
| | 222 | + ); |
| 222 | 223 | } |
| 223 | 224 | |
| 224 | 225 | /** |
| — | — | @@ -231,12 +232,13 @@ |
| 232 | 233 | function feedItem( $row ) { |
| 233 | 234 | $rev = new Revision( $row ); |
| 234 | 235 | $rev->setTitle( $this->title ); |
| 235 | | - $text = FeedUtils::formatDiffRow( $this->title, |
| 236 | | - $this->title->getPreviousRevisionID( $rev->getId() ), |
| 237 | | - $rev->getId(), |
| 238 | | - $rev->getTimestamp(), |
| 239 | | - $rev->getComment() ); |
| 240 | | - |
| | 236 | + $text = FeedUtils::formatDiffRow( |
| | 237 | + $this->title, |
| | 238 | + $this->title->getPreviousRevisionID( $rev->getId() ), |
| | 239 | + $rev->getId(), |
| | 240 | + $rev->getTimestamp(), |
| | 241 | + $rev->getComment() |
| | 242 | + ); |
| 241 | 243 | if( $rev->getComment() == '' ) { |
| 242 | 244 | global $wgContLang; |
| 243 | 245 | $title = wfMsgForContent( 'history-feed-item-nocomment', |
| — | — | @@ -245,14 +247,14 @@ |
| 246 | 248 | } else { |
| 247 | 249 | $title = $rev->getUserText() . wfMsgForContent( 'colon-separator' ) . FeedItem::stripComment( $rev->getComment() ); |
| 248 | 250 | } |
| 249 | | - |
| 250 | 251 | return new FeedItem( |
| 251 | 252 | $title, |
| 252 | 253 | $text, |
| 253 | 254 | $this->title->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ), |
| 254 | 255 | $rev->getTimestamp(), |
| 255 | 256 | $rev->getUserText(), |
| 256 | | - $this->title->getTalkPage()->getFullUrl() ); |
| | 257 | + $this->title->getTalkPage()->getFullUrl() |
| | 258 | + ); |
| 257 | 259 | } |
| 258 | 260 | } |
| 259 | 261 | |
| — | — | @@ -301,7 +303,7 @@ |
| 302 | 304 | |
| 303 | 305 | function formatRow( $row ) { |
| 304 | 306 | if( $this->lastRow ) { |
| 305 | | - $latest = $this->counter == 1 && $this->mIsFirst; |
| | 307 | + $latest = ($this->counter == 1 && $this->mIsFirst); |
| 306 | 308 | $firstInList = $this->counter == 1; |
| 307 | 309 | $s = $this->historyLine( $this->lastRow, $row, $this->counter++, |
| 308 | 310 | $this->title->getNotificationTimestamp(), $latest, $firstInList ); |
| — | — | @@ -473,6 +475,7 @@ |
| 474 | 476 | |
| 475 | 477 | $tools = array(); |
| 476 | 478 | |
| | 479 | + # Rollback and undo links |
| 477 | 480 | if( !is_null( $next ) && is_object( $next ) ) { |
| 478 | 481 | if( $latest && $this->title->userCan( 'rollback' ) && $this->title->userCan( 'edit' ) ) { |
| 479 | 482 | $tools[] = '<span class="mw-rollback-link">'. |