Merge changes I8b6b8510,I1cae6174
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Nov 2013 13:48:52 +0000 (13:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Nov 2013 13:48:52 +0000 (13:48 +0000)
* changes:
  Create cachedEntry after processing change block
  Get date in EnhancedChangesList::recentChangesLine from baseRC

includes/changes/EnhancedChangesList.php

index c8439be..1727da0 100644 (file)
@@ -57,14 +57,9 @@ class EnhancedChangesList extends ChangesList {
        public function recentChangesLine( &$baseRC, $watched = false ) {
                wfProfileIn( __METHOD__ );
 
-               # Create a specialised object
-               $cacheEntry = RCCacheEntry::newFromParent( $baseRC );
-
-               $curIdEq = array( 'curid' => $cacheEntry->mAttribs['rc_cur_id'] );
-
                # If it's a new day, add the headline and flush the cache
                $date = $this->getLanguage()->userDate(
-                       $cacheEntry->mAttribs['rc_timestamp'],
+                       $baseRC->mAttribs['rc_timestamp'],
                        $this->getUser()
                );
 
@@ -78,6 +73,11 @@ class EnhancedChangesList extends ChangesList {
                        $this->lastdate = $date;
                }
 
+               # Create a specialised object
+               $cacheEntry = RCCacheEntry::newFromParent( $baseRC );
+
+               $curIdEq = array( 'curid' => $cacheEntry->mAttribs['rc_cur_id'] );
+
                # Should patrol-related stuff be shown?
                $cacheEntry->unpatrolled = $this->showAsUnpatrolled( $cacheEntry );