From 0881bbbb64197107d1ca284a6022ef88548ca334 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 30 Nov 2016 11:26:15 -0800 Subject: [PATCH 1/3] [ticket/14883] Do not display empty forum rules (after reparsing) PHPBB3-14883 --- phpBB/includes/functions_display.php | 5 +++++ 1 file changed, 5 insertions(+) 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'], From 2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 1 Dec 2016 08:09:21 -0800 Subject: [PATCH 2/3] [ticket/14883] Refactor forum rules logic PHPBB3-14883 --- phpBB/includes/functions_display.php | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 0a3c698551..34f0d518a2 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -726,6 +726,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod */ function generate_forum_rules(&$forum_data) { + if ($forum_data['forum_rules']) + { + $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'] && !$forum_data['forum_rules_link']) { return; @@ -733,20 +738,10 @@ function generate_forum_rules(&$forum_data) global $template; - if ($forum_data['forum_rules']) - { - $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'], - 'FORUM_RULES' => $forum_data['forum_rules']) + 'S_FORUM_RULES' => true, + 'U_FORUM_RULES' => $forum_data['forum_rules_link'], + 'FORUM_RULES' => $forum_data['forum_rules']) ); } From bad9943208c9ec07851bd368215c200a3c064e98 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 1 Dec 2016 08:10:08 -0800 Subject: [PATCH 3/3] [ticket/14883] Remove extra tabbage PHPBB3-14883 --- phpBB/includes/functions_display.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 34f0d518a2..de7dfa0399 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -739,9 +739,9 @@ function generate_forum_rules(&$forum_data) global $template; $template->assign_vars(array( - 'S_FORUM_RULES' => true, - 'U_FORUM_RULES' => $forum_data['forum_rules_link'], - 'FORUM_RULES' => $forum_data['forum_rules']) + 'S_FORUM_RULES' => true, + 'U_FORUM_RULES' => $forum_data['forum_rules_link'], + 'FORUM_RULES' => $forum_data['forum_rules']) ); }