aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-05-30 19:24:53 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-05-30 19:24:53 +0000
commit6aa42b69abe798388aad4f7e6bf943dfb608e896 (patch)
tree0b5f6dc0ed309bf7a59cf32714d14bf848b7637d /phpBB/includes/functions_display.php
parentae93b82e19612c9ab99c11ca9641c1fca32588d4 (diff)
downloadforums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.gz
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.bz2
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.tar.xz
forums-6aa42b69abe798388aad4f7e6bf943dfb608e896.zip
- forum rules + link to forum rules
- three new (tiny) functions added to functions_posting responsible for handling text with bbcode/smilies/urls, use them at items all over across phpbb... - some bugfixes within admin_forums and other files - new admin_board layout (much safer, security wise) git-svn-id: file:///svn/phpbb/trunk@4903 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 3bd9aba370..1932e2d2df 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -13,7 +13,7 @@
function display_forums($root_data = '', $display_moderators = TRUE)
{
- global $config, $db, $template, $auth, $user, $phpEx, $SID, $forum_moderators;
+ global $config, $db, $template, $auth, $user, $phpEx, $SID, $forum_moderators, $phpbb_root_path;
// Get posted/get info
$mark_read = request_var('mark', '');
@@ -300,11 +300,10 @@ function display_forums($root_data = '', $display_moderators = TRUE)
'S_IS_CAT' => false,
'S_IS_LINK' => ($row['forum_type'] != FORUM_LINK) ? false : true,
- 'FORUM_IMG' => $row['forum_image'],
'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
'FORUM_ID' => $row['forum_id'],
- 'FORUM_FOLDER_IMG' => $user->img($folder_image, $folder_alt),
+ 'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $folder_alt . '" border="0" />' : $user->img($folder_image, $folder_alt),
'FORUM_NAME' => $row['forum_name'],
'FORUM_DESC' => $row['forum_desc'],
$l_post_click_count => $post_click_count,