aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-13 20:24:55 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-13 20:24:55 +0100
commit0579795a173db538ce4aeb9b3ce09e55581e9f87 (patch)
tree65a87cf87d44ad59624662abe3cfbd6a9fe3d1e8 /phpBB
parent00f792f16f6f8c9a826c5a44e539fb3aeb80c340 (diff)
parentb371d62dd3e8f7a207b7398fb0fe3150799d350b (diff)
downloadforums-0579795a173db538ce4aeb9b3ce09e55581e9f87.tar
forums-0579795a173db538ce4aeb9b3ce09e55581e9f87.tar.gz
forums-0579795a173db538ce4aeb9b3ce09e55581e9f87.tar.bz2
forums-0579795a173db538ce4aeb9b3ce09e55581e9f87.tar.xz
forums-0579795a173db538ce4aeb9b3ce09e55581e9f87.zip
Merge remote-tracking branch 'nickvergessen/ticket/7138' into develop-olympus
* nickvergessen/ticket/7138: [ticket/7138] Allow simple header and footer for trigger_error() messages
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/message_body.html12
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
index 896f0b826e..3a970769b7 100644
--- a/phpBB/styles/prosilver/template/message_body.html
+++ b/phpBB/styles/prosilver/template/message_body.html
@@ -1,4 +1,8 @@
-<!-- INCLUDE overall_header.html -->
+<!-- IF S_SIMPLE_MESSAGE -->
+ <!-- INCLUDE simple_header.html -->
+<!-- ELSE -->
+ <!-- INCLUDE overall_header.html -->
+<!-- ENDIF -->
<div class="panel" id="message">
<div class="inner"><span class="corners-top"><span></span></span>
@@ -8,4 +12,8 @@
<span class="corners-bottom"><span></span></span></div>
</div>
-<!-- INCLUDE overall_footer.html --> \ No newline at end of file
+<!-- IF S_SIMPLE_MESSAGE -->
+ <!-- INCLUDE simple_footer.html -->
+<!-- ELSE -->
+ <!-- INCLUDE overall_footer.html -->
+<!-- ENDIF -->