[xoops-svn] SF.net SVN: xoops-svn:[10252] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ moduleadmin.php

[<du...@us...>]

Revision: 10252
          http://sourceforge.net/p/xoops/svn/10252
Author:   dugris
Date:     2012-11-09 13:27:35 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix : renderNavigation

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-09 13:19:32 UTC (rev 10251)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/moduleadmin.php	2012-11-09 13:27:35 UTC (rev 10252)
@@ -346,11 +346,14 @@
     {
         $xoops = Xoops::getInstance();
 
-        $path = XOOPS_URL . "/media/xoops/images/icons/32/";
         $this->_obj->loadAdminMenu();
         foreach (array_keys($this->_obj->adminmenu) as $i) {
             if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) {
-                $this->_obj->adminmenu[$i]['icon'] = $path . $this->_obj->adminmenu[$i]['icon'];
+                if ( file_exists($xoops->path("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']) ) ) {
+                    $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/media/xoops/images/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+                } else {
+                    $this->_obj->adminmenu[$i]['icon'] = $xoops->url("/modules/" . $xoops->module->dirname() . "/icons/32/" . $this->_obj->adminmenu[$i]['icon']);
+                }
                 $xoops->tpl->assign('xo_sys_navigation', $this->_obj->adminmenu[$i]);
                 if ($xoops->tpl_name == '') {
                     $xoops->tpl->display($this->getTplPath('nav'));