makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-12-02 11:27:00 +01:00
commit 58a7ac9b5b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions_display.php
View file

@ -729,6 +729,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
*/ */
function generate_forum_rules(&$forum_data) 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']) if (!$forum_data['forum_rules'] && !$forum_data['forum_rules_link'])
{ {
return; return;
@ -736,11 +741,6 @@ function generate_forum_rules(&$forum_data)
global $template; 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( $template->assign_vars(array(
'S_FORUM_RULES' => true, 'S_FORUM_RULES' => true,
'U_FORUM_RULES' => $forum_data['forum_rules_link'], 'U_FORUM_RULES' => $forum_data['forum_rules_link'],