From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 5 Oct 2017 22:43:07 +0000 (+0200)
Subject: Fix bulk revert of edit history
X-Git-Tag: 3.1.0_Beta_2~53
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2b4c931c7fe28cc490100f746ae9364f235cebd;p=GitHub%2FWoltLab%2FWCF.git

Fix bulk revert of edit history
---

diff --git a/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php b/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php
index b6787987bf..77792bdea7 100644
--- a/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php
+++ b/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php
@@ -121,6 +121,7 @@ class EditHistoryManager extends SingletonFactory {
 			WHERE		revertTo.objectID = vandalizedEntries2.objectID
 				AND	revertTo.objectTypeID = vandalizedEntries2.objectTypeID
 				AND	(	revertTo.obsoletedAt <= ?
+					OR	revertTo.time <= ?
 					OR	revertTo.userID NOT IN(".$userIDPlaceholders."))
 			GROUP BY revertTo.objectTypeID, revertTo.objectID";
 		$statement = WCF::getDB()->prepareStatement($sql);
@@ -128,6 +129,7 @@ class EditHistoryManager extends SingletonFactory {
 			[TIME_NOW - $timeframe],
 			$userIDs,
 			[TIME_NOW - $timeframe],
+			[TIME_NOW - $timeframe],
 			$userIDs
 		));