From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 28 Jul 2016 21:00:23 +0000 (+0200)
Subject: Revert "Fixed wrong language in mail notifications"
X-Git-Tag: 3.0.0_Beta_1~916^2~1^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=53a7078f73469d2ad7da7fa3cad631ddc321cd0c;p=GitHub%2FWoltLab%2FWCF.git

Revert "Fixed wrong language in mail notifications"

This reverts commit 93c9f6ef5564d6787d21366dd6db4e4e1e752dda.
---

diff --git a/wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php
index 01832135c3..d1a1e45467 100644
--- a/wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/DailyMailNotificationCronjob.class.php
@@ -163,7 +163,6 @@ class DailyMailNotificationCronjob extends AbstractCronjob {
 					$notification->additionalData
 				);
 				$class->setLanguage($user->getLanguage());
-				WCF::setLanguage($user->getLanguage()->languageID);
 				
 				if (isset($authorToNotification[$notification->notificationID])) {
 					$eventAuthors = [];
diff --git a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
index 991fe3005a..a3459d39c3 100644
--- a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
@@ -236,9 +236,6 @@ class UserNotificationHandler extends SingletonFactory {
 						}
 					}
 				}
-				
-				// reset language to current user language
-				WCF::setLanguage(WCF::getUser()->getLanguage()->languageID);
 			}
 			
 			// reset notification count
@@ -645,7 +642,6 @@ class UserNotificationHandler extends SingletonFactory {
 		
 		// recipient's language
 		$event->setLanguage($user->getLanguage());
-		WCF::setLanguage($user->getLanguage()->languageID);
 		
 		// generate token if not present
 		if (!$user->notificationMailToken) {