From e8523564d1f8c5b98eaca700e65948c87efd4a75 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sun, 27 May 2012 13:06:35 +0900
Subject: [PATCH] =?utf8?q?FIX:=20AdminActions::parse=5Fcategories()?=
 =?utf8?q?=E3=81=AB=E3=82=88=E3=82=8A=E4=B8=8D=E8=A6=81=E3=81=AA=E5=95=8F?=
 =?utf8?q?=E3=81=84=E5=90=88=E3=82=8F=E3=81=9B=E3=81=8C=E8=A1=8C=E3=82=8F?=
 =?utf8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?utf8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

<%categories%>はページアクション「createitem」「itemedit」でのみ使用可能なことを踏まえてコードを整理した。
---
 nucleus/libs/AdminActions.php | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index db3f323..f942d46 100644
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1518,45 +1518,16 @@ class AdminActions extends BaseActions
 	{
 		global $manager;
 		
-		$item = FALSE;
-		$itemid	=  intRequestVar('itemid');
-		$item	= &$manager->getItem($itemid, 1, 1);
-		
-		$blog = FALSE;
-		if ( !$item )
+		if ( !array_key_exists('catid', Admin::$contents) || empty(Admin::$contents['catid']) )
 		{
-			$blogid	=  intRequestVar('blogid');
+			$catid = Admin::$blog->getDefaultCategory();
 		}
 		else
 		{
-			$blogid	=  $item['blogid'];
-		}
-		$blog	= &$manager->getBlog($blogid);
-		
-		if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
-		{
-			$item['body'] = removeBreaks($item['body']);
-			$item['more'] = removeBreaks($item['more']);
+			$catid = Admin::$contents['catid'];
 		}
 		
-		$contents = array();
-		if ( requestVar('action') == 'itemedit' )
-		{
-			$contents = $item;
-		}
-		
-		if ( !array_key_exists('catid', $contents) || empty($contents['catid']) )
-		{
-			// on add item
-			$catid = $blog->getDefaultCategory();
-		}
-		else
-		{
-			// on edit item
-			$catid = $contents['catid'];
-		}
-		
-		$this->selectBlog('catid', 'category', $catid, $startidx, 1, $blog->getID());
+		$this->selectBlog('catid', 'category', $catid, $startidx, 1, Admin::$blog->getID());
 		
 		return;
 	}
@@ -1602,7 +1573,7 @@ class AdminActions extends BaseActions
 		{
 			echo Entity::hsc($row['cname']);
 		}
-	
+		
 		return;
 	}
 	
-- 
2.11.0