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 abb97d808e42cb20a6be41a88ba65b1d26d8b23d..a507c30ae7e61f575c1dc7ae90f996d3124b16c4 100644 (file)
--- 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 b53086ac364b0a5765c7740441cacd4370c6a781..593169e8d6ddb1528f8a07f2a5b8376e92e7157f 100644 (file)
--- 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 d62863893e776c5c31e873b76c9810d167f7f15a..7f3d15bf6d53407d8afbcfc0d7d76c2a628a898e 100644 (file)
--- 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 89733fc26afcd0bd76f41b574880a37fbcdc1910..2b0a70849f3ad0c29536f1cc468e89030bdb9f60 100644 (file)
--- 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);
        }
 }