| Index: trunk/phase3/includes/PageHistory.php |
| — | — | @@ -197,6 +197,9 @@ |
| 198 | 198 | if( $firstInList ) { |
| 199 | 199 | // We don't currently handle well changing the top revision's settings |
| 200 | 200 | $del = wfMsgHtml( 'rev-delundel' ); |
| | 201 | + } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { |
| | 202 | + // If revision was hidden from sysops |
| | 203 | + $del = wfMsgHtml( 'rev-delundel' ); |
| 201 | 204 | } else { |
| 202 | 205 | $del = $this->mSkin->makeKnownLinkObj( $revdel, |
| 203 | 206 | wfMsg( 'rev-delundel' ), |
| — | — | @@ -206,23 +209,28 @@ |
| 207 | 210 | $s .= "(<small>$del</small>) "; |
| 208 | 211 | } |
| 209 | 212 | |
| | 213 | + $s .= " $link"; |
| 210 | 214 | #getUser is safe, but this avoids making the invalid untargeted contribs links |
| 211 | 215 | if( $row->rev_deleted & Revision::DELETED_USER ) { |
| 212 | 216 | $user = '<span class="history-deleted">' . wfMsg('rev-deleted-user') . '</span>'; |
| 213 | | - $s .= " $link <span class='history-user'>$user</span>"; |
| 214 | | - } else { |
| 215 | | - $s .= " $link <span class='history-user'>$user</span>"; |
| 216 | 217 | } |
| | 218 | + $s .= " <span class='history-user'>$user</span>"; |
| 217 | 219 | |
| 218 | 220 | if( $row->rev_minor_edit ) { |
| 219 | 221 | $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); |
| 220 | 222 | } |
| 221 | | - |
| 222 | | - $s .= $this->mSkin->revComment( $rev ); |
| | 223 | + #getComment is safe, but this is better formatted |
| | 224 | + if( $rev->isDeleted( Revision::DELETED_COMMENT ) ) { |
| | 225 | + $s .= " <span class=\"history-deleted\"><span class=\"comment\">" . |
| | 226 | + wfMsgHtml( 'rev-deleted-comment' ) . "</span></span>"; |
| | 227 | + } else { |
| | 228 | + $s .= $this->mSkin->commentBlock( $rev->getComment() ); |
| | 229 | + } |
| | 230 | + |
| 223 | 231 | if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) { |
| 224 | 232 | $s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>'; |
| 225 | 233 | } |
| 226 | | - #add blurb about having been deleted |
| | 234 | + #add blurb about text having been deleted |
| 227 | 235 | if( $row->rev_deleted & Revision::DELETED_TEXT ) { |
| 228 | 236 | $s .= ' ' . wfMsgHtml( 'deletedrev' ); |
| 229 | 237 | } |