From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 14 Jun 2016 10:21:20 +0000 (+0200)
Subject: Removed obsolete trailing slashes from void elements
X-Git-Tag: 3.0.0_Beta_1~1452
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8367cae36240427a63b4d7d0dafbc4a110bffcaf;p=GitHub%2FWoltLab%2FWCF.git

Removed obsolete trailing slashes from void elements
---

diff --git a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php
index abb97d808e..a507c30ae7 100644
--- a/wcfsetup/install/files/lib/system/exception/AJAXException.class.php
+++ b/wcfsetup/install/files/lib/system/exception/AJAXException.class.php
@@ -72,7 +72,7 @@ class AJAXException extends LoggedException {
 		// - debug mode is enabled
 		// - within ACP and a SystemException was thrown
 		if (WCF::debugModeIsEnabled(false) || WCF::debugModeIsEnabled() && self::INTERNAL_ERROR) {
-			$responseData['stacktrace'] = nl2br($stacktrace);
+			$responseData['stacktrace'] = nl2br($stacktrace, false);
 		}
 		
 		$statusHeader = '';
diff --git a/wcfsetup/install/files/lib/system/option/user/NewlineToBreakUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/NewlineToBreakUserOptionOutput.class.php
index b53086ac36..593169e8d6 100644
--- a/wcfsetup/install/files/lib/system/option/user/NewlineToBreakUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/NewlineToBreakUserOptionOutput.class.php
@@ -19,6 +19,6 @@ class NewlineToBreakUserOptionOutput implements IUserOptionOutput {
 	 * @inheritDoc
 	 */
 	public function getOutput(User $user, UserOption $option, $value) {
-		return nl2br(StringUtil::encodeHTML($value));
+		return nl2br(StringUtil::encodeHTML($value), false);
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
index d62863893e..7f3d15bf6d 100644
--- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
@@ -982,7 +982,7 @@ class TemplateScriptingCompiler {
 				$result .= $this->compileVariableTag($value, false);
 			}
 			catch (SystemException $e) {
-				throw new SystemException($this->formatSyntaxError('syntax error in tag {'.($elseif ? 'elseif' : 'if').'}', $this->currentIdentifier, $this->currentLineNo), 0, nl2br($e));
+				throw new SystemException($this->formatSyntaxError('syntax error in tag {'.($elseif ? 'elseif' : 'if').'}', $this->currentIdentifier, $this->currentLineNo), 0, nl2br($e, false));
 			}
 			
 			if ($leftParenthesis < $rightParenthesis) {
diff --git a/wcfsetup/install/files/lib/system/template/plugin/NewlineToBreakModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/NewlineToBreakModifierTemplatePlugin.class.php
index 89733fc26a..2b0a70849f 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/NewlineToBreakModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/NewlineToBreakModifierTemplatePlugin.class.php
@@ -18,6 +18,6 @@ class NewlineToBreakModifierTemplatePlugin implements IModifierTemplatePlugin {
 	 * @inheritDoc
 	 */
 	public function execute($tagArgs, TemplateEngine $tplObj) {
-		return nl2br(StringUtil::encodeHTML($tagArgs[0]));
+		return nl2br(StringUtil::encodeHTML($tagArgs[0]), false);
 	}
 }