aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-16 15:07:38 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-16 15:07:38 +0000
commitcc5d77e06d4daf4b5899717a9b8695a72e5927b4 (patch)
tree011e78bcee597b127da2b0c3aa9a2558fff80444
parent2eeeaadcfdb710d14cacca46e0c573e1e1d372f1 (diff)
downloadforums-cc5d77e06d4daf4b5899717a9b8695a72e5927b4.tar
forums-cc5d77e06d4daf4b5899717a9b8695a72e5927b4.tar.gz
forums-cc5d77e06d4daf4b5899717a9b8695a72e5927b4.tar.bz2
forums-cc5d77e06d4daf4b5899717a9b8695a72e5927b4.tar.xz
forums-cc5d77e06d4daf4b5899717a9b8695a72e5927b4.zip
make topic icon image width/height available to viewforum and search templates (Bug #15934)
git-svn-id: file:///svn/phpbb/trunk@8858 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/search.php4
-rw-r--r--phpBB/viewforum.php3
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index 2e6ec89662..9e57c45e4c 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -800,6 +800,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'),
+ 'TOPIC_FOLDER_IMG_ALT' => $user->lang[$folder_alt],
+ 'TOPIC_FOLDER_IMG_WIDTH'=> $user->img($folder_img, '', false, '', 'width'),
+ 'TOPIC_FOLDER_IMG_HEIGHT' => $user->img($folder_img, '', false, '', 'height'),
+
'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 1314a0bb33..585cfeb596 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -637,6 +637,9 @@ if (sizeof($topic_list))
'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'),
'TOPIC_FOLDER_IMG_ALT' => $user->lang[$folder_alt],
+ 'TOPIC_FOLDER_IMG_WIDTH'=> $user->img($folder_img, '', false, '', 'width'),
+ 'TOPIC_FOLDER_IMG_HEIGHT' => $user->img($folder_img, '', false, '', 'height'),
+
'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',