From b39f4af0adae277c781c0cc844de82d03ab685ef Mon Sep 17 00:00:00 2001
From: shizuki <shizuki@kinezumi.net>
Date: Fri, 13 Apr 2012 18:00:55 +0900
Subject: [PATCH] =?utf8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E7=94=A8?=
 =?utf8?q?=E3=82=B9=E3=82=AD=E3=83=B3=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA?=
 =?utf8?q?=E3=81=97=E3=82=BF=E3=82=A4=E3=83=97=E5=8F=8A=E3=81=B3=E3=82=B9?=
 =?utf8?q?=E3=82=AD=E3=83=B3=E5=A4=89=E6=95=B0=E3=81=AE=E4=B8=80=E9=83=A8?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=20Admin::batchMoveSelectDestination=E3=81=A8A?=
 =?utf8?q?dmin::batchMoveCategorySelectDestination=E3=81=AE=E5=91=BC?=
 =?utf8?q?=E3=81=B3=E5=87=BA=E3=81=97=E3=82=BF=E3=82=A4=E3=83=97=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=20=E3=82=B9=E3=82=AD=E3=83=B3=E5=A4=89?=
 =?utf8?q?=E6=95=B0<%batchmovetype%>=E3=81=AB=E6=B8=A1=E3=81=99=E5=80=A4?=
 =?utf8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=20=E3=82=B9=E3=82=AD=E3=83=B3?=
 =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=97=E3=80=8Cbatchmovecat=E3=80=8D?=
 =?utf8?q?=E3=81=A7=E4=BD=BF=E7=94=A8=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=B9?=
 =?utf8?q?=E3=82=AD=E3=83=B3=E5=A4=89=E6=95=B0=E3=82=92=E8=A8=AD=E5=AE=9A?=
 =?utf8?q?=20Admin::action=5Fbatchteam=E3=81=8B=E3=82=89=E5=91=BC=E3=81=B3?=
 =?utf8?q?=E5=87=BA=E3=81=95=E3=82=8C=E3=82=8B=E3=82=B9=E3=82=AD=E3=83=B3?=
 =?utf8?q?=E3=82=BF=E3=82=A4=E3=83=97=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 nucleus/libs/ADMIN.php        | 4 +++-
 nucleus/libs/AdminActions.php | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 1c0ab0f..85857d7 100644
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -573,7 +573,7 @@ class Admin
 		}
 
 		$this->pagehead();
-		$this->parse('batchmember');
+		$this->parse('batchteam');
 		$this->pagefoot();
 	}
 
@@ -622,6 +622,7 @@ class Admin
 	 */
 	function batchMoveSelectDestination($type, $ids)
 	{
+		$_POST['batchmove'] = $type;
 		$this->pagehead();
 		$this->parse('batchmove');
 		$this->pagefoot();
@@ -633,6 +634,7 @@ class Admin
 	 */
 	function batchMoveCategorySelectDestination($type, $ids)
 	{
+		$_POST['batchmove'] = $type;
 		global $manager;
 		$this->pagehead();
 		$this->parse('batchmovecat');
diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index f6f791b..adb3b25 100644
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -399,6 +399,15 @@ class AdminActions extends BaseActions
 					'batchmovebtn',
 				);
 				break;
+			case 'batchmovecat':
+				$extra_actions = array(
+					'batchmovetitle',
+					'batchmovetype',
+					'batchmovelist',
+					'movedistselect',
+					'batchmovebtn',
+				);
+				break;
 			case 'batchteam':
 				$extra_actions = array(
 					'requestblogid',
-- 
2.11.0