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

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

Revision: 12367
          http://sourceforge.net/p/xoops/svn/12367
Author:   beckmi
Date:     2014-03-08 23:43:58 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.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	2014-03-08 18:46:30 UTC (rev 12366)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt	2014-03-08 23:43:58 UTC (rev 12367)
@@ -1,10 +1,15 @@
 XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
 
+===============================
+2014/xx/xx: Version 2.5.7 RC 1
+===============================
+
 Bugfixes:
 - fixed System Module image manager html/js bugs (luciorota)
+- replaced "array_diff_assoc" with "array_diff_key" in /class/theme_blocks.php (masel/mamba)
 
 ===============================
-2013/05/08: Version 2.5.7 Beta 1
+2014/03/06: Version 2.5.7 Beta 1
 ===============================
 Bugfixes:
 - ID: 1143 (old ID 430840)  class/module.errorhandler.php (uberrookie/zyspec)

Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php	2014-03-08 18:46:30 UTC (rev 12366)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/class/theme_blocks.php	2014-03-08 23:43:58 UTC (rev 12367)
@@ -198,7 +198,7 @@
             if ($this->theme && $bcachetime) {
                 $metas = array();
                 foreach ($this->theme->metas as $type => $value) {
-                    $dif = array_diff_assoc($this->theme->metas[$type], $old[$type]);
+                    $dif = array_diff_key($this->theme->metas[$type], $old[$type]);
                     if (count($dif)) {
                         $metas[$type] = $dif;
                     }