Merged codes from sourceforge.net.

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / ITEM.php

diff --git a/utf8/nucleus/libs/ITEM.php b/utf8/nucleus/libs/ITEM.php
index b9b1519..3a55fef 100755 (executable)
--- a/utf8/nucleus/libs/ITEM.php
+++ b/utf8/nucleus/libs/ITEM.php
@@ -156,7 +156,8 @@ class ITEM {
                NucleusPlugin::_applyPluginOptions($aOptions, $itemid);\r
                $manager->notify('PostPluginOptionsUpdate',array('context' => 'item', 'itemid' => $itemid, 'item' => array('title' => $i_title, 'body' => $i_body, 'more' => $i_more, 'closed' => $i_closed, 'catid' => $i_catid)));\r
 \r
-               if ($i_draftid > 0 && $member->canAlterItem($i_draftid) ) {\r
+               if ($i_draftid > 0) {\r
+                       // delete permission is checked inside ITEM::delete()\r
                        ITEM::delete($i_draftid);\r
                }\r
 \r
@@ -301,7 +302,11 @@ class ITEM {
                global $manager, $member;\r
 \r
                $itemid = intval($itemid);\r
-               if (!$member->canAlterItem($itemid)) return;\r
+               // check to ensure only those allow to alter the item can\r
+               // proceed\r
+               if (!$member->canAlterItem($itemid)) {\r
+                       return 1;\r
+               }\r
 \r
                $manager->notify('PreDeleteItem', array('itemid' => $itemid));\r
 \r