aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-03-16 14:45:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-03-16 14:45:22 +0000
commit48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0 (patch)
treeb9f9100d7ee1aaa7ce2e58ec0292f55ea430f16a /phpBB/includes/ucp
parent21aeaab002118fd76abf6b352122dfb7cd55f06a (diff)
downloadforums-48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0.tar
forums-48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0.tar.gz
forums-48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0.tar.bz2
forums-48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0.tar.xz
forums-48ffd72f6f3c6eb6b50dd1d18cdde9370c54cfd0.zip
Add topic icons to prosilver UCP main and subscribed templates (Bug #42735 - Patch by Raimon)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9371 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_main.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 6f4e525b2f..f3bc81652f 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -633,11 +633,14 @@ class ucp_main
*/
function assign_topiclist($mode = 'subscribed', $forbidden_forum_ary = array())
{
- global $user, $db, $template, $config, $auth, $phpbb_root_path, $phpEx;
+ global $user, $db, $template, $config, $cache, $auth, $phpbb_root_path, $phpEx;
$table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE;
$start = request_var('start', 0);
+ // Grab icons
+ $icons = $cache->obtain_icons();
+
$sql_array = array(
'SELECT' => 'COUNT(t.topic_id) as topics_count',
@@ -809,6 +812,7 @@ class ucp_main
'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_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'] : '',