aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-01 13:47:42 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-01 13:47:42 +0000
commit721a9dd4a146a08f26866196d8a347c7aad57274 (patch)
tree181f0955fd519718bc30274d226e4ddd108a7242 /phpBB/includes/functions_display.php
parent4354cda6dc695806dc01fdad1e4d11b2749ee9d4 (diff)
downloadforums-721a9dd4a146a08f26866196d8a347c7aad57274.tar
forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.gz
forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.bz2
forums-721a9dd4a146a08f26866196d8a347c7aad57274.tar.xz
forums-721a9dd4a146a08f26866196d8a347c7aad57274.zip
- create forums by default
- hide prune options if not enabled - fixed module management enable/disable switch if in module itself - fixed some schema errors - adjusted $user->page array generation for developers calling scripts outside of phpBB root git-svn-id: file:///svn/phpbb/trunk@5995 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 407a592c13..9981d106ac 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -230,11 +230,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if (!$row['parent_id'] && $row['forum_type'] == FORUM_CAT)
{
$template->assign_block_vars('forumrow', array(
- 'S_IS_CAT' => true,
- 'FORUM_ID' => $row['forum_id'],
- 'FORUM_NAME' => $row['forum_name'],
- 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']),
- 'U_VIEWFORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $row['forum_id'])
+ 'S_IS_CAT' => true,
+ 'FORUM_ID' => $row['forum_id'],
+ 'FORUM_NAME' => $row['forum_name'],
+ 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']),
+ 'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['FORUM_CAT'] . '" />' : '',
+ 'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
+ 'U_VIEWFORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $row['forum_id'])
);
continue;