From 6fadb5a1513bc618439bf24d68514c69936fc249 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Sat, 6 Oct 2018 10:39:47 +0000
Subject: [PATCH] Prevent notices/warnings when no priorities set for current
lang
---
lib/SimpleSAML/Locale/Translate.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 74d40c074..7bffffedf 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -536,14 +536,16 @@ class Translate
// we don't have a translation for the current language, load alternative priorities
$sspcfg = \SimpleSAML\Configuration::getInstance();
$langcfg = $sspcfg->getConfigItem('language', null);
- $priorities = array();
+ $priorities = [];
if ($langcfg instanceof \SimpleSAML\Configuration) {
$priorities = $langcfg->getArray('priorities', array());
}
- foreach ($priorities[$context['currentLanguage']] as $lang) {
- if (isset($translations[$lang])) {
- return $translations[$lang];
+ if ( !empty($priorities[$context['currentLanguage']]) ) {
+ foreach ($priorities[$context['currentLanguage']] as $lang) {
+ if (isset($translations[$lang])) {
+ return $translations[$lang];
+ }
}
}
--
GitLab