|
|
|
@ -3284,7 +3284,6 @@ class UserManager |
|
|
|
$historyLimit = (int) $historyLimit; |
|
|
|
$historyLimit = (int) $historyLimit; |
|
|
|
$interval = new \DateInterval('P'.$historyLimit.'D'); |
|
|
|
$interval = new \DateInterval('P'.$historyLimit.'D'); |
|
|
|
$historyEnded->sub($interval); |
|
|
|
$historyEnded->sub($interval); |
|
|
|
$finalDate = $historyEnded->format('Y-m-d'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ($isHistory) { |
|
|
|
if ($isHistory) { |
|
|
|
// History |
|
|
|
// History |
|
|
|
@ -3296,7 +3295,7 @@ class UserManager |
|
|
|
if (empty($row['access_end_date'])) { |
|
|
|
if (empty($row['access_end_date'])) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if ($row['access_end_date'] > $finalDate) { |
|
|
|
if ($row['access_end_date'] > $historyEnded) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -3310,7 +3309,7 @@ class UserManager |
|
|
|
if (isset($row['access_end_date']) && |
|
|
|
if (isset($row['access_end_date']) && |
|
|
|
!empty($row['access_end_date']) |
|
|
|
!empty($row['access_end_date']) |
|
|
|
) { |
|
|
|
) { |
|
|
|
if ($row['access_end_date'] <= $finalDate) { |
|
|
|
if ($row['access_end_date'] <= $historyEnded) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|