Added a hard-cap for visit tracker dates

Fixes #2522

diff --git a/wcfsetup/install/files/lib/system/visitTracker/VisitTracker.class.php b/wcfsetup/install/files/lib/system/visitTracker/VisitTracker.class.php
index 432c3621452d5498c3c1bf9c352400d93b4af59a..06bfd90976843997caa5f8c18ccf32be80b520f8 100644 (file)
--- a/wcfsetup/install/files/lib/system/visitTracker/VisitTracker.class.php
+++ b/wcfsetup/install/files/lib/system/visitTracker/VisitTracker.class.php
@@ -94,15 +94,19 @@ class VisitTracker extends SingletonFactory {
                        }
                }
                
-               if (isset($this->userVisits[$objectTypeID])) {
-                       return $this->userVisits[$objectTypeID];
-               }
+               $lifetime = ($this->availableObjectTypes[$objectType]->lifetime) ?: self::DEFAULT_LIFETIME;
+               $minimum = TIME_NOW - $lifetime;
                
-               if ($this->availableObjectTypes[$objectType]->lifetime) {
-                       return TIME_NOW - $this->availableObjectTypes[$objectType]->lifetime;
+               if (isset($this->userVisits[$objectTypeID])) {
+                       // double times the lifetime period for existing visit data;
+                       // equals 2 weeks for the default lifetime of 7 days
+                       $minimum -= $lifetime;
+                       
+                       // using `max()` here will yield the most recent point in time
+                       return max($this->userVisits[$objectTypeID], $minimum);
                }
                
-               return TIME_NOW - self::DEFAULT_LIFETIME;
+               return $minimum;
        }
        
        /**