aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-11-30 11:26:15 -0800
committerMatt Friedman <maf675@gmail.com>2016-11-30 11:26:15 -0800
commit0881bbbb64197107d1ca284a6022ef88548ca334 (patch)
treeb839dd0c24c6d76266817643869db96be7f8aa60
parent9c7e8c2dc5607a594f1e8d3a633dc686e8c002a7 (diff)
downloadforums-0881bbbb64197107d1ca284a6022ef88548ca334.tar
forums-0881bbbb64197107d1ca284a6022ef88548ca334.tar.gz
forums-0881bbbb64197107d1ca284a6022ef88548ca334.tar.bz2
forums-0881bbbb64197107d1ca284a6022ef88548ca334.tar.xz
forums-0881bbbb64197107d1ca284a6022ef88548ca334.zip
[ticket/14883] Do not display empty forum rules (after reparsing)
PHPBB3-14883
-rw-r--r--phpBB/includes/functions_display.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 4726676e2d..0a3c698551 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -738,6 +738,11 @@ function generate_forum_rules(&$forum_data)
$forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']);
}
+ if (!$forum_data['forum_rules'])
+ {
+ return;
+ }
+
$template->assign_vars(array(
'S_FORUM_RULES' => true,
'U_FORUM_RULES' => $forum_data['forum_rules_link'],