Utilize new default icon theme path

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11638 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/templates/util_global.php b/templates/util_global.php
index 87c3984f54f0b8a2ffc2d6afc60b37ca36fa141a..9969c2f66a34fb8130d206111537959dd53fe1a4 100644 (file)
--- a/templates/util_global.php
+++ b/templates/util_global.php
@@ -61,15 +61,20 @@ function getIcon($icon_theme_path, $icon_name, $text_icon, $alt_text='', $w=NULL
  * @since 1.5.2
  */
 function getIconPath ($icon_theme_path, $icon_name) {
+    global $icon_theme_def;
+
     if (is_null($icon_theme_path))
         return NULL;
     
     // Desired icon exists in the current theme?
     if (is_file($icon_theme_path . $icon_name)) {
         return $icon_theme_path . $icon_name;
-
+        
+    // Icon not found, check for the admin-specified default
+    } elseif (!is_null($icon_theme_def) && is_file($icon_theme_def . $icon_name)) {
+        return $icon_theme_def . $icon_name;
+        
     // Icon not found, return the SQM default icon
-    // TODO: allow admins to change the default icon theme in conf.pl
     } elseif (is_file(SM_PATH . 'images/themes/default/'.$icon_name)) {
         return SM_PATH . 'images/themes/default/'.$icon_name;
     }