From 145184a70fe7a33d24891205397cf5260cea74ec Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 20 May 2013 19:34:38 +0200
Subject: [PATCH] Fixed bulk processing

Fixes #1233
---
 .../files/acp/templates/userBulkProcessing.tpl      | 12 ++++++++++++
 .../lib/acp/form/UserBulkProcessingForm.class.php   | 13 ++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
index c7d6d615f0..085bc1628e 100644
--- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -1,5 +1,17 @@
 {include file='header' pageTitle='wcf.acp.user.bulkProcessing'}
 
+{if $mailID|isset}
+	<script type="text/javascript">
+		//<![CDATA[
+		$(function() {
+			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
+				mailID: {@$mailID}
+			});
+		});
+		//]]>
+	</script>
+{/if}
+
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
index f35c300ae8..21d92ccb75 100644
--- a/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserBulkProcessingForm.class.php
@@ -254,7 +254,7 @@ class UserBulkProcessingForm extends UserOptionListForm {
 				$mailID = count($userMailData);
 				$userMailData[$mailID] = array(
 					'action' => '',
-					'userIDs' => implode(',', $userIDs),
+					'userIDs' => $userIDs,
 					'groupIDs' => '',
 					'subject' => $this->subject,
 					'text' => $this->text,
@@ -262,17 +262,8 @@ class UserBulkProcessingForm extends UserOptionListForm {
 					'enableHTML' => $this->enableHTML
 				);
 				WCF::getSession()->register('userMailData', $userMailData);
-				$this->saved();
-				
-				$url = LinkHandler::getInstance()->getLink('UserMail', array('id' => $mailID));
 				
-				// show worker template
-				WCF::getTPL()->assign(array(
-					'pageTitle' => WCF::getLanguage()->get('wcf.acp.user.sendMail'),
-					'url' => $url
-				));
-				WCF::getTPL()->display('worker');
-				exit;
+				WCF::getTPL()->assign('mailID', $mailID);
 			break;
 			
 			case 'exportMailAddress':
-- 
2.20.1