From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 27 Dec 2016 16:24:13 +0000 (+0100)
Subject: Fixed deletion of user notification events
X-Git-Tag: 3.0.0_RC_3~25^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d20d8573d2baf813837badfe717e7780079a434b;p=GitHub%2FWoltLab%2FWCF.git

Fixed deletion of user notification events
---

diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
index d7f1c79e72..d835a5a9b9 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
@@ -41,11 +41,13 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI
 	protected function handleDelete(array $items) {
 		$sql = "DELETE FROM	wcf".WCF_N."_".$this->tableName."
 			WHERE		packageID = ?
+					AND objectTypeID = ?
 					AND eventName = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		foreach ($items as $item) {
 			$statement->execute(array(
 				$this->installation->getPackageID(),
+				$this->getObjectTypeID($item['elements']['objecttype']),
 				$item['elements']['name']
 			));
 		}
@@ -55,21 +57,6 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI
 	 * @see	\wcf\system\package\plugin\AbstractXMLPackageInstallationPlugin::prepareImport()
 	 */
 	protected function prepareImport(array $data) {
-		// get object type id
-		$sql = "SELECT	object_type.objectTypeID
-			FROM	wcf".WCF_N."_object_type object_type
-			WHERE	object_type.objectType = ?
-				AND object_type.definitionID IN (
-					SELECT	definitionID
-					FROM	wcf".WCF_N."_object_type_definition
-					WHERE	definitionName = 'com.woltlab.wcf.notification.objectType'
-				)";
-		$statement = WCF::getDB()->prepareStatement($sql, 1);
-		$statement->execute(array($data['elements']['objecttype']));
-		$row = $statement->fetchArray();
-		if (empty($row['objectTypeID'])) throw new SystemException("unknown notification object type '".$data['elements']['objecttype']."' given");
-		$objectTypeID = $row['objectTypeID'];
-		
 		$presetMailNotificationType = 'none';
 		if (isset($data['elements']['presetmailnotificationtype']) && ($data['elements']['presetmailnotificationtype'] == 'instant' || $data['elements']['presetmailnotificationtype'] == 'daily')) {
 			$presetMailNotificationType = $data['elements']['presetmailnotificationtype'];
@@ -78,7 +65,7 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI
 		return array(
 			'eventName' => $data['elements']['name'],
 			'className' => $data['elements']['classname'],
-			'objectTypeID' => $objectTypeID,
+			'objectTypeID' => $this->getObjectTypeID($data['elements']['objecttype']),
 			'permissions' => (isset($data['elements']['permissions']) ? $data['elements']['permissions'] : ''),
 			'options' => (isset($data['elements']['options']) ? $data['elements']['options'] : ''),
 			'preset' => (!empty($data['elements']['preset']) ? 1 : 0),
@@ -135,4 +122,27 @@ class UserNotificationEventPackageInstallationPlugin extends AbstractXMLPackageI
 			'parameters' => $parameters
 		);
 	}
+	
+	/**
+	 * Gets the id of given object type id.
+	 *
+	 * @param       string          $objectType
+	 * @return      integer
+	 */
+	protected function getObjectTypeID($objectType) {
+		// get object type id
+		$sql = "SELECT	object_type.objectTypeID
+			FROM	wcf".WCF_N."_object_type object_type
+			WHERE	object_type.objectType = ?
+				AND object_type.definitionID IN (
+					SELECT	definitionID
+					FROM	wcf".WCF_N."_object_type_definition
+					WHERE	definitionName = 'com.woltlab.wcf.notification.objectType'
+				)";
+		$statement = WCF::getDB()->prepareStatement($sql, 1);
+		$statement->execute([$objectType]);
+		$row = $statement->fetchArray();
+		if (empty($row['objectTypeID'])) throw new SystemException("unknown notification object type '".$objectType."' given");
+		return $row['objectTypeID'];
+	}
 }