diff options
| author | Matt Friedman <maf675@gmail.com> | 2016-12-01 08:09:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 08:09:21 -0800 |
| commit | 2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a (patch) | |
| tree | 6a9eb971410565abc5c1f0aae08bec72f8129791 /phpBB/includes/functions_display.php | |
| parent | 0881bbbb64197107d1ca284a6022ef88548ca334 (diff) | |
| download | forums-2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a.tar forums-2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a.tar.gz forums-2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a.tar.bz2 forums-2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a.tar.xz forums-2fcc1b4d188b7e2fc77baa4ddb1ee4cfe154d92a.zip | |
[ticket/14883] Refactor forum rules logic
PHPBB3-14883
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 17 |
1 files changed, 6 insertions, 11 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,27 +726,22 @@ 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_link']) - { - return; - } - - 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']) + if (!$forum_data['forum_rules'] && !$forum_data['forum_rules_link']) { return; } + 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']) ); } |