summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-10-30 22:05:20 +0100
committerGitHub <noreply@github.com>2018-10-30 22:05:20 +0100
commit1293affc84db2e9e2ea127bb1dd44faaa85f9797 (patch)
tree8e35077bbde007f5a0df7fe381988b9d2f001288
parenta3e9e0f8c6a91874a5c314f5af126d1272a083be (diff)
parent5c51d84a674f7f91b91666596f4619892003bf63 (diff)
downloadnextcloud-server-1293affc84db2e9e2ea127bb1dd44faaa85f9797.tar.gz
nextcloud-server-1293affc84db2e9e2ea127bb1dd44faaa85f9797.zip
Merge pull request #12020 from nextcloud/bugfix/11795/calendar_invitation_fallback_lang
Calendar invitation: use system default instead of sender's language as fallback
-rw-r--r--apps/dav/lib/CalDAV/Schedule/IMipPlugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
index 6f303acba33..3ff3ed0c569 100644
--- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -170,7 +170,7 @@ class IMipPlugin extends SabreIMipPlugin {
$vevent = $iTipMessage->message->VEVENT;
$attendee = $this->getCurrentAttendee($iTipMessage);
- $defaultLang = $this->config->getUserValue($this->userId, 'core', 'lang', $this->l10nFactory->findLanguage());
+ $defaultLang = $this->l10nFactory->findLanguage();
$lang = $this->getAttendeeLangOrDefault($defaultLang, $attendee);
$l10n = $this->l10nFactory->get('dav', $lang);