[xoops-svn] SF.net SVN: xoops-svn:[11800] XoopsCore/branches/2.5.x/2.5.7

[<be...@us...>]

Revision: 11800
          http://sourceforge.net/p/xoops/svn/11800
Author:   beckmi
Date:     2013-06-30 08:00:14 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
added check for menu link description in ModuleAdmin, fixed wrong return icon in Smarty xoModuleIcons32

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php

Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-06-29 15:46:07 UTC (rev 11799)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2013-06-30 08:00:14 UTC (rev 11800)
@@ -9,6 +9,8 @@
 - removing @ in link[@rel*=style][title] in styleswitch.js (not needed in jQuery 1.83) (SMEDrieben/Mamba)
 - added missing "`" in upgrade from 2.0.18 to 2.3.0 (mamba)
 - fixing errors in upgrade from 2.4.0 to 2.4.1 (mamba,voltan)
+- added check for menu link description in ModuleAdmin
+- fixed wrong return icon in Smarty xoModuleIcons32
 
 ===============================
 2013/04/21: Version 2.5.6 Final

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php	2013-06-29 15:46:07 UTC (rev 11799)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons32.php	2013-06-30 08:00:14 UTC (rev 11800)
@@ -11,29 +11,28 @@
 /**
  * xoModuleIcons32 Smarty compiler plug-in
  *
- * @copyright   The XOOPS project http://www.xoops.org/
- * @license     http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author		Andricq Nicolas (AKA MusS) 
- * @since       2.5.2
- * @version		$Id$
+ * @copyright      The XOOPS project http://www.xoops.org/
+ * @license        http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author         Andricq Nicolas (AKA MusS)
+ * @since          2.5.2
+ * @version        $Id$
  */
 
 function smarty_compiler_xoModuleIcons32($argStr, &$smarty)
 {
     global $xoops, $xoTheme;
-       
-    $icons = xoops_getModuleOption('typeicons', 'system');
-    if ( $icons == '' ) $icons = 'default';
-    
-    if ( file_exists( $xoops->path('Frameworks/moduleclasses/icons/32/' . $icons . '/index.html'))) {
-        $url = $xoops->url( 'Frameworks/moduleclasses/icons/32/' . $icons . '/' . $argStr );
+
+    if (file_exists($xoops->path('Frameworks/moduleclasses/icons/32/index.html'))) {
+        $url = $xoops->url('Frameworks/moduleclasses/icons/32/' . $argStr);
+
     } else {
-        if ( file_exists( $xoops->path('modules/system/images/icons/default/' . $argStr ))) {
-            $url = $xoops->url( 'modules/system/images/icons/default/' . $argStr );
+        if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
+            $url = $xoops->url('modules/system/images/icons/default/' . $argStr);
         } else {
-            $url = $xoops->url( 'modules/system/images/icons/default/xoops/xoops.png' );
+            $url = $xoops->url('modules/system/images/icons/default/xoops/xoops.png');
         }
     }
-    return "\necho '" . addslashes( $url ) . "';";
+    return "\necho '" . addslashes($url) . "';";
 }
+
 ?>
\ No newline at end of file