xoops-svn

[<rgr...@us...>]

Revision: 12240
          http://sourceforge.net/p/xoops/svn/12240
Author:   rgriffith
Date:     2013-12-11 05:27:59 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
Apply patch from Irmtfan to prevent multiple inclusions of a module's xoops_version.php #1274

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php	2013-12-10 21:44:07 UTC (rev 12239)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/kernel/module.php	2013-12-11 05:27:59 UTC (rev 12240)
@@ -224,10 +224,17 @@
      *
      * @param string $dirname Module directory
      * @param bool   $verbose Give an error on fail?
+     *
+     * @return bool true if loaded
      */
     function loadInfo($dirname, $verbose = true)
     {
+        static $modVersions;
         $dirname = basename($dirname);
+        if(isset($modVersions[$dirname])) {
+            $this->modinfo = $modVersions[$dirname];
+            return true;
+        }
         global $xoopsConfig;
         if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $dirname . '/language/' . $xoopsConfig['language'] . '/modinfo.php'))) {
             include_once $file;
@@ -243,7 +250,8 @@
             return false;
         }
         include $file;
-        $this->modinfo = $modversion;
+        $modVersions[$dirname] = $modversion;
+        $this->modinfo = $modVersions[$dirname];
 
         return true;
     }