OSDN Git Service
(root)
/
nucleus-jp
/
nucleus-next.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'skinnable-master'
[nucleus-jp/nucleus-next.git]
/
nucleus
/
libs
/
ITEMACTIONS.php
diff --git
a/nucleus/libs/ITEMACTIONS.php
b/nucleus/libs/ITEMACTIONS.php
index
9aa96d4
..
7db9281
100644
(file)
--- a/
nucleus/libs/ITEMACTIONS.php
+++ b/
nucleus/libs/ITEMACTIONS.php
@@
-14,7
+14,11
@@
*
* @license http://nucleuscms.org/license.txt GNU General Public License
* @copyright Copyright (C) 2002-2009 The Nucleus Group
*
* @license http://nucleuscms.org/license.txt GNU General Public License
* @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
* @version $Id: ITEMACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $
* @version $Id: ITEMACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
+ * @version $Id: ITEMACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
*/
class ItemActions extends BaseActions
{
*/
class ItemActions extends BaseActions
{
@@
-101,7
+105,11
@@
class ItemActions extends BaseActions
/* actions defined in BodyAction class */
'image',
'media',
/* actions defined in BodyAction class */
'image',
'media',
+<<<<<<< HEAD
'popup',
'popup',
+=======
+ 'popup'
+>>>>>>> skinnable-master
);
/**
);
/**
@@
-753,9
+761,16
@@
class ItemActions extends BaseActions
array_shift($params);
// add item reference (array_unshift didn't work)
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,'doTemplateVar'), $params);
$params = array_merge(array(&$this->currentItem),$params);
call_user_func_array(array(&$plugin,'doTemplateVar'), $params);
+=======
+ $target = array(&$this->currentItem);
+ $params = array_merge($target,$params);
+
+ call_user_func_array(array($plugin,'doTemplateVar'), $params);
+>>>>>>> skinnable-master
return;
}
return;
}
@@
-817,7
+832,12
@@
class ItemActions extends BaseActions
$handler->setCurrentItem($this->currentItem);
$parser = new Parser($handler);
$handler->setCurrentItem($this->currentItem);
$parser = new Parser($handler);
+<<<<<<< HEAD
$parser->parse($handler->highlight($data));
$parser->parse($handler->highlight($data));
+=======
+ $highlight = $handler->highlight($data);
+ $parser->parse($highlight);
+>>>>>>> skinnable-master
return;
}
return;
}
@@
-847,8
+867,14
@@
class ItemActions extends BaseActions
$condition = ($blog && ($blog->getSetting($name) == $value));
break;
case 'itemblogsetting':
$condition = ($blog && ($blog->getSetting($name) == $value));
break;
case 'itemblogsetting':
+<<<<<<< HEAD
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
$condition = ($b && ($b->getSetting($name) == $value));
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
$condition = ($b && ($b->getSetting($name) == $value));
+=======
+ $item =& $manager->getItem($this->currentItem['itemid'], 1, 1);
+ $t_blog =& $manager->getBlog($item['blogid']);
+ $condition = ($t_blog && ($t_blog->getSetting($name) == $value));
+>>>>>>> skinnable-master
break;
case 'loggedin':
$condition = $member->isLoggedIn();
break;
case 'loggedin':
$condition = $member->isLoggedIn();
@@
-920,8
+946,11
@@
class ItemActions extends BaseActions
{
global $member, $manager;
{
global $member, $manager;
+<<<<<<< HEAD
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
+>>>>>>> skinnable-master
// when no parameter is defined, just check if author is current visitor
if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )
{
// when no parameter is defined, just check if author is current visitor
if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )
{
@@
-941,6
+970,7
@@
class ItemActions extends BaseActions
// check if author is admin
if ( ($key == 'isadmin') )
{
// check if author is admin
if ( ($key == 'isadmin') )
{
+<<<<<<< HEAD
$aid = intval($this->currentItem['authorid']);
$blogid = intval($b->getID());
$amember =& $manager->getMember($aid);
$aid = intval($this->currentItem['authorid']);
$blogid = intval($b->getID());
$amember =& $manager->getMember($aid);
@@
-949,6
+979,14
@@
class ItemActions extends BaseActions
return TRUE;
}
return (boolean) $amember->isBlogAdmin($blogid);
return TRUE;
}
return (boolean) $amember->isBlogAdmin($blogid);
+=======
+ $i_author =& $manager->getMember($this->currentItem['authorid']);
+ if ( $i_author->isAdmin() )
+ {
+ return TRUE;
+ }
+ return (boolean) $i_author->isBlogAdmin($this->currentItem['blogid']);
+>>>>>>> skinnable-master
}
return FALSE;
}
return FALSE;
@@
-966,12
+1004,20
@@
class ItemActions extends BaseActions
{
global $catid, $manager;
{
global $catid, $manager;
+<<<<<<< HEAD
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
$b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
+ $blog =& $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 == '') )
{
// when no parameter is defined, just check if a category is selected
if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
{
+<<<<<<< HEAD
return (boolean) $b->isValidCategory($catid);
return (boolean) $b->isValidCategory($catid);
+=======
+ return (boolean) $blog->isValidCategory($catid);
+>>>>>>> skinnable-master
}
$icatid = $this->currentItem['catid'];
}
$icatid = $this->currentItem['catid'];
@@
-979,17
+1025,28
@@
class ItemActions extends BaseActions
// check category name
if ( $key == 'catname' )
{
// check category name
if ( $key == 'catname' )
{
+<<<<<<< HEAD
$value = $b->getCategoryIdFromName($value);
if ( $value == $icatid )
{
return (boolean) $b->isValidCategory($icatid);
$value = $b->getCategoryIdFromName($value);
if ( $value == $icatid )
{
return (boolean) $b->isValidCategory($icatid);
+=======
+ $value = $blog->getCategoryIdFromName($value);
+ if ( $value == $icatid )
+ {
+ return (boolean) $blog->isValidCategory($icatid);
+>>>>>>> skinnable-master
}
}
// check category id
if ( ($key == 'catid') && ($value == $icatid) )
{
}
}
// check category id
if ( ($key == 'catid') && ($value == $icatid) )
{
+<<<<<<< HEAD
return (boolean) $b->isValidCategory($icatid);
return (boolean) $b->isValidCategory($icatid);
+=======
+ return (boolean) $blog->isValidCategory($icatid);
+>>>>>>> skinnable-master
}
return FALSE;
}
}
return FALSE;
}
@@
-1123,6
+1180,10
@@
class ItemActions extends BaseActions
$params = func_get_args();
array_shift($params);
$params = func_get_args();
array_shift($params);
+<<<<<<< HEAD
return (boolean) call_user_func_array(array(&$plugin, 'doIf'), $params);
return (boolean) call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
+ return (boolean) call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
}
}
}
}