From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 27 Sep 2014 20:16:59 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~294
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8062d0ae5837e82567b2a06e95d274ced9b00bdc;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
---

8062d0ae5837e82567b2a06e95d274ced9b00bdc
diff --cc wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
index 5b699ee67d,e71c12d5cb..c16870c2be
--- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
+++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
@@@ -180,23 -171,9 +186,22 @@@ class QuickReplyManager extends Singlet
  		$parameters['data']['username'] = WCF::getUser()->username;
  		
  		// pre-parse message text
- 		$parameters['data']['message'] = MessageUtil::stripCrap($parameters['data']['message']);
 -		$parameters['data']['message'] = PreParser::getInstance()->parse($parameters['data']['message'], $this->allowedBBodes);
 +		if ($parameters['data']['preParse']) {
 +			$parameters['data']['message'] = PreParser::getInstance()->parse($parameters['data']['message'], $this->allowedBBodes);
 +		}
 +		unset($parameters['data']['preParse']);
 +		
 +		$parameters['data'] = array_merge($additionalFields, $parameters['data']);
 +		
 +		// attachment support
 +		if (MODULE_ATTACHMENT && $object instanceof IAttachmentMessageQuickReplyAction) {
 +			$parameters['attachmentHandler'] = $object->getAttachmentHandler($this->container);
 +		}
  		
  		$message = $object->create();
 +		$eventParameters = array('message' => $message);
 +		EventHandler::getInstance()->fireAction($this, 'createdMessage', $eventParameters);
 +		
  		if ($message instanceof IMessage && !$message->isVisible()) {
  			return array(
  				'isVisible' => false