From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 20 May 2013 17:25:35 +0000 (+0200)
Subject: Fixed mail worker
X-Git-Tag: 2.0.0_Beta_1~136^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92d682e601ac440ff4a5bb8ca099f53c20308512;p=GitHub%2FWoltLab%2FWCF.git

Fixed mail worker
---

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 35585de709..9017853955 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -12,7 +12,7 @@
 	<script type="text/javascript">
 		//<![CDATA[
 		$(function() {
-			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', {
+			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
 				mailID: {@$mailID}
 			});
 		});
diff --git a/wcfsetup/install/files/lib/system/worker/MailWorker.class.php b/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
index 08161d8013..4852bde7bf 100644
--- a/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
@@ -5,6 +5,7 @@ use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\mail\Mail;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
 
@@ -125,7 +126,7 @@ class MailWorker extends AbstractWorker {
 	 */
 	protected function sendMail(User $user) {
 		try {
-			$mail = new Mail(array($user->username => $user->email), $this->userMailData['subject'], StringUtil::replace('{$username}', $user->username, $this->mailData['text']), $this->mailData['from']);
+			$mail = new Mail(array($user->username => $user->email), $this->mailData['subject'], StringUtil::replace('{$username}', $user->username, $this->mailData['text']), $this->mailData['from']);
 			if ($this->mailData['enableHTML']) $mail->setContentType('text/html');
 			$mail->setLanguage($user->getLanguage());
 			$mail->send();
@@ -139,7 +140,6 @@ class MailWorker extends AbstractWorker {
 	 * @see	wcf\system\worker\IWorker::getProceedURL()
 	 */
 	public function getProceedURL() {
-		// todo: use LinkHander?
-		return 'index.php?page=UserList' . SID_ARG_2ND_NOT_ENCODED;
+		return LinkHandler::getInstance()->getLink('UserList');
 	}
 }