aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewfolder.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-02-28 00:07:59 +0100
committerIgor Wiedler <igor@wiedler.ch>2011-02-28 00:07:59 +0100
commitab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200 (patch)
treed8ca15ef2fff63547bc0b5c0d98edc06fac2c06d /phpBB/includes/ucp/ucp_pm_viewfolder.php
parentf49b8a0e3eb7b0caad763e5bab4c846ce17204b0 (diff)
parent39a26785bb6669633969a7af01d1422e289e7b3f (diff)
downloadforums-ab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200.tar
forums-ab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200.tar.gz
forums-ab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200.tar.bz2
forums-ab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200.tar.xz
forums-ab3f45c0e9c2f96c3b4c5fa17c4f460aa2a2d200.zip
Merge branch 'ticket/hanakin/10001' into develop
* ticket/hanakin/10001: [ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images [ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 4efa09c3c8..0aaaaf4dbb 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -165,6 +165,7 @@ function view_folder($id, $mode, $folder_id, $folder)
'PM_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
'PM_ICON_URL' => (!empty($icons[$row['icon_id']])) ? $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] : '',
'FOLDER_IMG' => $user->img($folder_img, $folder_alt),
+ 'FOLDER_IMG_STYLE' => $folder_img,
'FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'),
'PM_IMG' => ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
'ATTACH_ICON_IMG' => ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',