From: stevetruckstuff Date: Fri, 24 Feb 2006 22:29:09 +0000 (+0000) Subject: Incorporated getIconPath to allow third-party packages (like dTree) to getch the... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7c8f16f328cfe7b3189b16e2a6b3ce9a3159e0bb;p=squirrelmail.git Incorporated getIconPath to allow third-party packages (like dTree) to getch the correct icon path. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10824 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/templates/util_global.php b/templates/util_global.php index 62ce4309..2299a0d6 100644 --- a/templates/util_global.php +++ b/templates/util_global.php @@ -30,18 +30,11 @@ function getIcon($icon_theme_path, $icon_name, $text_icon, $alt_text='', $w=NULL if (is_null($icon_theme_path)) { $icon = $text_icon; } else { - // Desired icon exists in the current theme? - if (is_file($icon_theme_path . $icon_name)) { - $icon_path = $icon_theme_path . $icon_name; + $icon_path = getIconPath($icon_theme_path, $icon_name); - // Icon not found, return the SQM default icon - } elseif (is_file(SM_PATH . 'images/themes/default/'.$icon_name)) { - $icon_path = SM_PATH . 'images/themes/default/'.$icon_name; - } - // If we found an icon, build an img tag to display it. If we didn't // find an image, we will revert back to the text icon. - if (isset($icon_path) && !is_null($icon_path)) { + if (!is_null($icon_path)) { $icon = ' \ No newline at end of file