Fix point of determination of last event time

It has to be determined after truncation so that only the truncated
objects are considered.

diff --git a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
index e5389161e39e3cddcdb3fdd7929d82eb2969ac85..135e5e936c1439ee180344ccbc08636111b800cd 100644 (file)
--- a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
+++ b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
@@ -53,17 +53,15 @@ class RecentActivityListPage extends AbstractPage {
        public function assignVariables() {
                parent::assignVariables();
                
-               $lastEventTime = $this->eventList->getLastEventTime();
-               
                // removes orphaned and non-accessible events
                UserActivityEventHandler::validateEvents($this->eventList);
                
                // remove unused items
                $this->eventList->truncate(20);
-                               
+               
                WCF::getTPL()->assign([
                        'eventList' => $this->eventList,
-                       'lastEventTime' => $lastEventTime,
+                       'lastEventTime' => $this->eventList->getLastEventTime(),
                        'allowSpidersToIndexThisPage' => true
                ]);
        }

diff --git a/wcfsetup/install/files/lib/system/menu/user/profile/content/RecentActivityUserProfileMenuContent.class.php b/wcfsetup/install/files/lib/system/menu/user/profile/content/RecentActivityUserProfileMenuContent.class.php
index 1e34b9f62ccaf2445d162c7c58dae15f5b958dc7..da55f79d6fb055fc91c8bb306f92d32448e30018 100644 (file)
--- a/wcfsetup/install/files/lib/system/menu/user/profile/content/RecentActivityUserProfileMenuContent.class.php
+++ b/wcfsetup/install/files/lib/system/menu/user/profile/content/RecentActivityUserProfileMenuContent.class.php
@@ -26,17 +26,14 @@ class RecentActivityUserProfileMenuContent extends SingletonFactory implements I
                $eventList->getConditionBuilder()->add("user_activity_event.userID = ?", [$userID]);
                $eventList->readObjects();
                
-               $lastEventTime = $eventList->getLastEventTime();
-               if ($lastEventTime) {
-                       UserActivityEventHandler::validateEvents($eventList);
-               }
+               UserActivityEventHandler::validateEvents($eventList);
                
                // remove unused items
                $eventList->truncate(20);
                
                WCF::getTPL()->assign([
                        'eventList' => $eventList,
-                       'lastEventTime' => $lastEventTime,
+                       'lastEventTime' => $eventList->getLastEventTime(),
                        'placeholder' => WCF::getLanguage()->get('wcf.user.profile.content.recentActivity.noEntries'),
                        'userID' => $userID
                ]);