From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 1 Nov 2013 11:15:56 +0000 (+0100)
Subject: Fixed potential encoding issue
X-Git-Tag: 2.0.0_Beta_11~8^2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=075dcb1ad50303c059ce8478103043e364b4fcab;p=GitHub%2FWoltLab%2FWCF.git

Fixed potential encoding issue
---

diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl
index 8f1a1132bc..e539a14095 100644
--- a/com.woltlab.wcf/templates/messageQuoteList.tpl
+++ b/com.woltlab.wcf/templates/messageQuoteList.tpl
@@ -32,7 +32,13 @@
 											</span>
 											
 											<div class="jsQuote">
-												<label for="quote_{@$quoteID}">{@$quote}</label>
+												<label for="quote_{@$quoteID}">
+													{if $message->isFullQuote($quoteID)}
+														{@$quote}
+													{else}
+														{$quote}
+													{/if}
+												</label>
 											</div>
 											<div class="jsFullQuote">
 												{$message->getFullQuote($quoteID)}
diff --git a/wcfsetup/install/files/lib/system/message/quote/QuotedMessage.class.php b/wcfsetup/install/files/lib/system/message/quote/QuotedMessage.class.php
index cfa3be58e4..ba3baf9589 100644
--- a/wcfsetup/install/files/lib/system/message/quote/QuotedMessage.class.php
+++ b/wcfsetup/install/files/lib/system/message/quote/QuotedMessage.class.php
@@ -97,6 +97,21 @@ class QuotedMessage implements \Countable, \Iterator {
 		return null;
 	}
 	
+	/**
+	 * Returns true if given quote id represents a full quote.
+	 * 
+	 * @param	string		$quoteID
+	 * @return	boolean
+	 */
+	public function isFullQuote($quoteID) {
+		if (isset($this->fullQuotes[$quoteID]) && $this->quotes[$quoteID] != $this->fullQuotes[$quoteID]) {
+			// full quotes are parsed and differ from their original
+			return true;
+		}
+		
+		return false;
+	}
+	
 	/**
 	 * @see	\Countable::count()
 	 */