Changeset 692:8b5744a9a3c6 for inc/admin/prepend.php
- Timestamp:
- 08/15/11 19:04:50 (14 years ago)
- Branch:
- default
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
inc/admin/prepend.php
r691 r692 60 60 function dc_admin_icon_url($img) 61 61 { 62 if (defined('DC_ADMIN_ICONSET') && ($img)) { 62 global $core; 63 64 $core->auth->user_prefs->addWorkspace('interface'); 65 $user_ui_iconset = @$core->auth->user_prefs->interface->iconset; 66 if (($user_ui_iconset) && ($img)) { 63 67 $icon = false; 64 68 if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 65 69 (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) { 66 70 if ($m[1]) { 67 $icon = path::real(dirname(__FILE__).'/../../admin/images/iconset/'. DC_ADMIN_ICONSET.'/'.$m[1],false);71 $icon = path::real(dirname(__FILE__).'/../../admin/images/iconset/'.$user_ui_iconset.'/'.$m[1],false); 68 72 if ($icon !== false) { 69 73 $allow_types = array('png','jpg','jpeg','gif'); 70 74 if (is_file($icon) && is_readable($icon) && in_array(files::getExtension($icon),$allow_types)) { 71 return DC_ADMIN_URL.'images/iconset/'. DC_ADMIN_ICONSET.'/'.$m[1];75 return DC_ADMIN_URL.'images/iconset/'.$user_ui_iconset.'/'.$m[1]; 72 76 } 73 77 }
Note: See TracChangeset
for help on using the changeset viewer.