Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved $wgShowUpdatedMarker checks to the right place

Browse source 
Change-Id: Icee2ec24aac5fe78f7204aabf434640251791cae
This commit is contained in:
Aaron Schulz 2015-04-14 18:56:39 -07:00
parent 65b0335134
commit 14979be39d
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/Title.php
View file

@ -4409,7 +4409,7 @@ class Title {
* @return string|null
*/
public function getNotificationTimestamp( $user = null ) {
global $wgUser, $wgShowUpdatedMarker;
global $wgUser;
// Assume current user if none given
if ( !$user ) {
@ -4417,7 +4417,7 @@ class Title {
}
// Check cache first
$uid = $user->getId();
if ( !$uid || !$wgShowUpdatedMarker ) {
if ( !$uid ) {
return false;
}
// avoid isset here, as it'll return false for null entries

18
includes/actions/HistoryAction.php
View file

@ -432,8 +432,13 @@ class HistoryPager extends ReverseChronologicalPager {
$latest = ( $this->counter == 1 && $this->mIsFirst );
$firstInList = $this->counter == 1;
$this->counter++;
$s = $this->historyLine( $this->lastRow, $row,
$this->getTitle()->getNotificationTimestamp( $this->getUser() ), $latest, $firstInList );
$notifTimestamp = $this->getConfig()->get( 'ShowUpdatedMarker' )
? $this->getTitle()->getNotificationTimestamp( $this->getUser() )
: false;
$s = $this->historyLine(
$this->lastRow, $row, $notifTimestamp, $latest, $firstInList );
} else {
$s = '';
}
@ -532,8 +537,13 @@ class HistoryPager extends ReverseChronologicalPager {
$next = $this->mPastTheEndRow;
}
$this->counter++;
$s = $this->historyLine( $this->lastRow, $next,
$this->getTitle()->getNotificationTimestamp( $this->getUser() ), $latest, $firstInList );
$notifTimestamp = $this->getConfig()->get( 'ShowUpdatedMarker' )
? $this->getTitle()->getNotificationTimestamp( $this->getUser() )
: false;
$s = $this->historyLine(
$this->lastRow, $next, $notifTimestamp, $latest, $firstInList );
} else {
$s = '';
}