From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 3 Oct 2013 13:06:43 +0000 (+0200)
Subject: Fixed spoiler bbcode issue
X-Git-Tag: 2.0.0_Beta_11~77
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24dc5bc213d33b2d6180617a422a02581f5c310f;p=GitHub%2FWoltLab%2FWCF.git

Fixed spoiler bbcode issue
---

diff --git a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
index af9e5cde56..2b11f52cec 100644
--- a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
@@ -1,16 +1,14 @@
+<!-- begin:parser_nonessential -->
 <div class="container containerPadding spoilerBox jsSpoilerBox">
-	<!-- begin:parser_nonessential -->
 	<header class="jsOnly">
 		<a class="button jsSpoilerToggle">{if $buttonTitle}{$buttonTitle}{else}{lang}wcf.bbcode.spoiler.show{/lang}{/if}</a>
 	</header>
-	<!-- end:parser_nonessential -->
 	
 	<div style="display: none">
 		{@$content}
 	</div>
 </div>
 
-<!-- begin:parser_nonessential -->
 <script data-relocate="true">
 	//<![CDATA[
 	$(function() {
diff --git a/wcfsetup/install/files/lib/util/MessageUtil.class.php b/wcfsetup/install/files/lib/util/MessageUtil.class.php
index 213560e0c1..0cceed34e3 100644
--- a/wcfsetup/install/files/lib/util/MessageUtil.class.php
+++ b/wcfsetup/install/files/lib/util/MessageUtil.class.php
@@ -102,4 +102,16 @@ class MessageUtil {
 		
 		return $usernames;
 	}
+	
+	/**
+	 * Truncates a formatted message and keeps the HTML syntax intact.
+	 *
+	 * @param	string		$message		string which shall be truncated
+	 * @param	integer		$maxLength		string length after truncating
+	 * @return	string					truncated string
+	 */
+	public static function truncateFormattedMessage($message, $maxLength = 1000) {
+		$message = Regex::compile('<!-- begin:parser_nonessential -->.*?<!-- end:parser_nonessential -->', Regex::DOT_ALL)->replace($message, '');
+		return StringUtil::truncateHTML($message, $maxLength);
+	}
 }