aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-05-16 17:06:50 +0200
committerNils Adermann <naderman@naderman.de>2010-05-16 17:06:50 +0200
commit355d4b8ff8d616ef8650240f936517ede03296b8 (patch)
tree499952b0c40b6456656f0c8f3338ca5b17e9b89a
parent1326264823f2dea19105efa45f457b3ff3cdf869 (diff)
parent18e0b07487d4195f7d979214be2900f36a943a61 (diff)
downloadforums-355d4b8ff8d616ef8650240f936517ede03296b8.tar
forums-355d4b8ff8d616ef8650240f936517ede03296b8.tar.gz
forums-355d4b8ff8d616ef8650240f936517ede03296b8.tar.bz2
forums-355d4b8ff8d616ef8650240f936517ede03296b8.tar.xz
forums-355d4b8ff8d616ef8650240f936517ede03296b8.zip
Merge branch 'ticket/nickvergessen/9528' into develop-olympus
* ticket/nickvergessen/9528: [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_history.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 88efcf95be..bcd6a75397 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -5,6 +5,11 @@
</h3>
<div id="topicreview">
+ <script type="text/javascript">
+ // <![CDATA[
+ bbcodeEnabled = {S_BBCODE_ALLOWED};
+ // ]]>
+ </script>
<!-- BEGIN history_row -->
<div class="post <!-- IF history_row.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>