r1574: In NotificationCenter::_localeFromUserId() we now take into account when the...

diff --git a/includes/class_notification.php b/includes/class_notification.php
index 38cfafb4a1bc29eede4679f8fe73f853388f36c6..7c7e9a1a3fa6c342df22b4cc2676d56cfc20d3cc 100644 (file)
--- a/includes/class_notification.php
+++ b/includes/class_notification.php
@@ -616,7 +616,10 @@ class NotificationCenter
        */
        function _localeFromUserId($userid)
        {
-               return $this->registry->datastore['language'][$this->users[$userid]['languageid']]['langcode'];
+               $langid = $this->users[$userid]['languageid'];
+               $langid = (!$langid ? $this->registry->options['defaultlanguage'] : $langid);
+               
+               return $this->registry->datastore['language'][$langid]['langcode'];
        }
 }