Merge pull request #2031 from aragonc/1.11.x

fix return icon custom - refs BT#11312
9 years ago · 2359ebfa08
parent 221bf96cbf 9bba78b3b1
commit 2359ebfa08
1 changed files with 5 additions and 4 deletions
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@ -739,14 +739,15 @@ class Display
        }

        $size_extra = $size.'/';
-
-        // Checking the img/ folder
-        $icon = $w_code_path.'img/'.$image;
-
        $theme = 'themes/chamilo/icons/';

        if ($loadThemeIcon) {
            $theme = 'themes/'.api_get_visual_theme().'/icons/';
+            if(is_file($alternateCssPath.$theme.$image)){
+                $icon = $alternateWebCssPath.$theme.$image;
+            }else{
+                $icon = $w_code_path.'img/'.$image;
+            }
            // Checking the theme icons folder example: app/Resources/public/css/themes/chamilo/icons/XXX
            if (is_file($alternateCssPath.$theme.$size_extra.$image)) {
                $icon = $alternateWebCssPath.$theme.$size_extra.$image;