[xoops-svn] SF.net SVN: xoops-svn:[10686] XoopsCore/branches/2.5.x/2.5.6

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

Revision: 10686
          http://sourceforge.net/p/xoops/svn/10686
Author:   beckmi
Date:     2013-01-06 19:07:24 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
fixed bug #1245 in class XoopsLoad.php (Alain91)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php

Added Paths:
-----------
    XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-06 18:33:49 UTC (rev 10685)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-06 19:07:24 UTC (rev 10686)
@@ -8,6 +8,7 @@
 
 Bugfixes:
  - fixed errors related to static functions, so it works on PHP 5.4 (Mamba)
+ - fixed bug #1245 in class XoopsLoad.php (Alain91)
  
 Updated:
  - TinyMCE to 3.5.8 (mamba)

Added: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png
===================================================================
(Binary files differ)

Index: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png	2013-01-06 18:33:49 UTC (rev 10685)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png	2013-01-06 19:07:24 UTC (rev 10686)

Property changes on: XoopsCore/branches/2.5.x/2.5.6/htdocs/Frameworks/moduleclasses/icons/16/view.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php	2013-01-06 18:33:49 UTC (rev 10685)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php	2013-01-06 19:07:24 UTC (rev 10686)
@@ -137,9 +137,8 @@
      * @return boolean True if the data was succesfully cached, false on failure
      * @access public
      */
-    function write($key, $value = null, $duration = null)
+    function write($key, $data = null, $duration = null)
     {
-        $data = $value;
         if (!isset($data) || ! $this->init) {
             return false;
         }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php	2013-01-06 18:33:49 UTC (rev 10685)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php	2013-01-06 19:07:24 UTC (rev 10686)
@@ -42,7 +42,7 @@
                 );
         }
         $name = strtolower($name);
-        if (array_key_exists($name, $deprecated)) {
+        if (in_array($type,array('core','class')) && array_key_exists($name, $deprecated)) {
             if (isset($GLOBALS['xoopsLogger'])) {
                 $GLOBALS['xoopsLogger']->addDeprecated("xoops_load('{$name}') is deprecated, use xoops_load('{$deprecated[$name]}')");
             } else {
@@ -56,7 +56,7 @@
             return $loaded[$type][$name];
         }
 
-        if (class_exists($name)) {
+        if (class_exists($name, false)) {
             $loaded[$type][$name] = true;
             return true;
         }