From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 Sep 2014 13:13:55 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~338
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4fc35f4a926eda91209652c74bcfff10976097ed;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/3rdParty/ckeditor/plugins/wbbcode/plugin.js
---

4fc35f4a926eda91209652c74bcfff10976097ed
diff --cc wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
index 7cd593ec65,132d0b5602..c24ccd3e28
--- a/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php
@@@ -86,10 -86,10 +86,10 @@@ class UserNotificationEventPackageInsta
  	protected function import(array $row, array $data) {
  		$result = parent::import($row, $data);
  		
- 		if (empty($row)) {
+ 		if (empty($row) && $data['preset']) {
  			$this->presetEventIDs[] = $result->eventID;
  		}
 -
 +		
  		return $result;
  	}