diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-02 11:26:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-02 11:26:57 +0100 |
| commit | 3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547 (patch) | |
| tree | 589eb8e37d9a3dec3070c2374685a0435ac07923 /phpBB/includes/functions_display.php | |
| parent | 7671c971e4ad4ad333c79399cbd9197a1a542494 (diff) | |
| parent | bad9943208c9ec07851bd368215c200a3c064e98 (diff) | |
| download | forums-3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547.tar forums-3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547.tar.gz forums-3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547.tar.bz2 forums-3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547.tar.xz forums-3ad13ebd88c66d4ba21bd7740e3fb2cfbc9c2547.zip | |
Merge pull request #4547 from VSEphpbb/ticket/14883
[ticket/14883] Do not display empty forum rules (after they've been re-parsed)
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 53d485cae3..498d468983 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -729,6 +729,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; @@ -736,11 +741,6 @@ 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']); - } - $template->assign_vars(array( 'S_FORUM_RULES' => true, 'U_FORUM_RULES' => $forum_data['forum_rules_link'], |