diff options
Diffstat (limited to 'includes/ChangesList.php')
| -rw-r--r-- | includes/ChangesList.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/includes/ChangesList.php b/includes/ChangesList.php index b224c0a68105..3578d2720137 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -205,8 +205,8 @@ class ChangesList { $r .= ' </tt>' ; $o = '' ; - if ( $rc_last_oldid != 0 ) { - $o = 'oldid='.$rc_last_oldid ; + if ( $rc_this_oldid != 0 ) { + $o = 'oldid='.$rc_this_oldid ; } if ( $rc_type == RC_LOG ) { $link = $rcObj->timestamp ; @@ -365,7 +365,7 @@ class ChangesList { $rc_user_text, 'target=' . $rc_user_text ); } else { $userPage =& Title::makeTitle( NS_USER, $rc_user_text ); - $userLink = $this->skin->makeLinkObj( $userPage, $rc_user_text ); + $userLink = $this->skin->makeLinkObj( $userPage, htmlspecialchars( $rc_user_text ) ); } $s .= $userLink; @@ -376,14 +376,14 @@ class ChangesList { $userTalkLink = ''; } else { $userTalkPage =& Title::makeTitle( NS_USER_TALK, $rc_user_text ); - $userTalkLink= $this->skin->makeLinkObj( $userTalkPage, $talkname ); + $userTalkLink= $this->skin->makeLinkObj( $userTalkPage, htmlspecialchars( $talkname ) ); } # Block link $blockLink=''; if ( ( $wgSysopUserBans || 0 == $rc_user ) && $wgUser->isAllowed('block') ) { $blockLinkPage = Title::makeTitle( NS_SPECIAL, 'Blockip' ); $blockLink = $this->skin->makeKnownLinkObj( $blockLinkPage, - $message['blocklink'], 'ip='.$rc_user_text ); + htmlspecialchars( $message['blocklink'] ), 'ip=' . urlencode( $rc_user_text ) ); } if($blockLink) { @@ -475,16 +475,17 @@ class ChangesList { } else { $rcIdQuery = ''; } - $query = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid"; + $querycur = $curIdEq."&diff=0&oldid=$rc_this_oldid"; + $querydiff = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid"; $aprops = ' tabindex="'.$baseRC->counter.'"'; - $curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $query, '' ,'' , $aprops ); + $curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $querycur, '' ,'' , $aprops ); if( $rc_type == RC_NEW || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { if( $rc_type != RC_NEW ) { $curLink = $message['cur']; } $diffLink = $message['diff']; } else { - $diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $query . $rcIdQuery, '' ,'' , $aprops ); + $diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $querydiff . $rcIdQuery, '' ,'' , $aprops ); } # Make "last" link |