[xoops-svn] SF.net SVN: xoops-svn:[10329] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<tr...@us...>]

Revision: 10329
          http://sourceforge.net/p/xoops/svn/10329
Author:   trabis
Date:     2012-12-08 01:46:05 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Fixing php 5.4.3 warnings

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php	2012-12-07 00:56:07 UTC (rev 10328)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/theme_blocks.php	2012-12-08 01:46:05 UTC (rev 10329)
@@ -152,6 +152,7 @@
      */
     public function buildBlock($xobject, &$template)
     {
+        $xoops = Xoops::getInstance();
         // The lame type workaround will change
         // bid is added temporarily as workaround for specific block manipulation
         $dirname = $xobject->getVar('dirname');
@@ -172,7 +173,7 @@
                 : "module:system|system_block_dummy.html";
         $cacheid = $this->generateCacheId('blk_' . $xobject->getVar('bid'));
 
-        Xoops::getInstance()->preload()->triggerEvent('core.themeblocks.buildblock.start', array($xobject, $template->is_cached($tplName, $cacheid)));
+        $xoops->preload()->triggerEvent('core.themeblocks.buildblock.start', array($xobject, $template->is_cached($tplName, $cacheid)));
 
         if (!$bcachetime || !$template->is_cached($tplName, $cacheid)) {
 
@@ -196,7 +197,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 = $xoops->arrayRecursiveDiff($this->theme->metas[$type], $old[$type]);
                     if (count($dif)) {
                         $metas[$type] = $dif;
                     }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php	2012-12-07 00:56:07 UTC (rev 10328)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/createconfigform.php	2012-12-08 01:46:05 UTC (rev 10329)
@@ -41,7 +41,7 @@
 function createConfigform($config)
 {
     $xoops = Xoops::getInstance();
-    //$config_handler = $xoops->getHandlerConfig();
+    $config_handler = $xoops->getHandlerConfig();
     //$xoops->config = $config_handler->getConfigsByCat(XOOPS_CONF);
     //$config =& $xoops->config;
 
@@ -111,8 +111,6 @@
                     asort($dirlist);
                     $ele->addOptionArray($dirlist);
                 }
-                // old theme value is used to determine whether to update cache or not. kind of dirty way
-                $ele = new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput());
                 break;
 
             case 'tplset':
@@ -123,8 +121,6 @@
                 foreach ($tplsetlist as $key => $name) {
                     $ele->addOption($key, $name);
                 }
-                // old theme value is used to determine whether to update cache or not. kind of dirty way
-                $ele = new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput());
                 break;
 
             case 'timezone':

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php	2012-12-07 00:56:07 UTC (rev 10328)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php	2012-12-08 01:46:05 UTC (rev 10329)
@@ -556,20 +556,24 @@
     /**
      * insert/update object
      *
-     * @param object $object
+     * @param XoopsObject $object
+     * @param bool        $force
+     *
      * @abstract
      */
-    public function insert($object)
+    function insert(XoopsObject $object, $force = true)
     {
     }
 
     /**
      * delete object from database
      *
-     * @param object $object
+     * @param XoopsObject $object
+     * @param bool        $force
+     *
      * @abstract
      */
-    public function delete($object)
+    public function delete(XoopsObject $object, $force = true)
     {
     }
 }

Modified: XoopsCore/bra