Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / libs / BODYACTIONS.php

diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php
index 137af90..8464021 100644 (file)
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@ -15,7 +15,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
  * @version $Id: BODYACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
+ * @version $Id: BODYACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class BodyActions extends BaseActions
@@ -39,7 +43,11 @@ class BodyActions extends BaseActions
         */
        public function __construct()
        {
+<<<<<<< HEAD
                parent::__construct();  
+=======
+               parent::__construct();
+>>>>>>> skinnable-master
                return;
        }
        
@@ -107,9 +115,16 @@ class BodyActions extends BaseActions
                array_shift($params);
                
                // add item reference (array_unshift didn't work)
+<<<<<<< HEAD
                $params = array_merge(array(&$this->currentItem), $params);
                
                call_user_func_array(array(&$plugin, 'doItemVar'), $params);
+=======
+               $target = array(&$this->currentItem);
+               $params = array_merge($target, $params);
+               
+               call_user_func_array(array($plugin, 'doItemVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -126,7 +141,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
                echo call_user_func_array(array(&$this, 'createImageCode'), $args);
+=======
+               echo call_user_func_array(array($this, 'createImageCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -174,7 +193,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
                echo call_user_func_array(array(&$this, 'createMediaCode'), $args);
+=======
+               echo call_user_func_array(array($this, 'createMediaCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -215,7 +238,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
                echo call_user_func_array(array(&$this, 'createPopupCode'), $args);
+=======
+               echo call_user_func_array(array($this, 'createPopupCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -280,7 +307,11 @@ class BodyActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));
                                break;
                        case 'itemblogsetting':
+<<<<<<< HEAD
                                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
+                               $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                                $condition = ($b && ($b->getSetting($name) == $value));
                                break;
                        case 'loggedin':
@@ -354,7 +385,11 @@ class BodyActions extends BaseActions
        {
                global $member, $manager;
                
+<<<<<<< HEAD
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
+               $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                
                // when no parameter is defined, just check if author is current visitor
                if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )
@@ -400,7 +435,11 @@ class BodyActions extends BaseActions
        {
                global $catid, $manager;
                
+<<<<<<< HEAD
                $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
+               $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                
                // when no parameter is defined, just check if a category is selected
                if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
@@ -558,6 +597,10 @@ class BodyActions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
                return call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
+               return call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
 }