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 01832135c3acb3da6ae467b21afef29cd8e055da..d1a1e45467dc7cf917f4a431afcd8e986cd388c8 100644 (file)
--- 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 991fe3005a8adb710884e1964da88042021aa038..a3459d39c34aa1cac2fba130489a675b7912eebc 100644 (file)
--- 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) {