From 947177661a12f144cd05038a4f32939a7b24dec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 24 Apr 2018 11:29:13 +0200
Subject: [PATCH] :ambulance: fix(language) list is a reserved word, use
getList instead
issue #5820
---
include/class_Language.inc | 4 ++--
plugins/config/class_configInLdap.inc | 2 +-
plugins/personal/generic/class_user.inc | 4 +++-
setup/class_setupStepLanguage.inc | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 192d50a2a..7b67c983d 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -112,7 +112,7 @@ class Language
}
/* Load supported languages */
- $languages = static::list();
+ $languages = static::getList();
/* Move supported languages to flat list */
$langs = array();
@@ -129,7 +129,7 @@ class Language
*
* \param boolean $ownLanguage Should language names be stated in their own language as well
*/
- public static function list($ownLanguage = FALSE)
+ public static function getList($ownLanguage = FALSE)
{
/* locales in english */
$tmp_english = array(
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 20cdbf1ae..bdc2e6624 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -451,7 +451,7 @@ class configInLdap extends simplePlugin
global $config;
$attributesInfo = static::getAttributesInfo();
/* Languages */
- $languages = Language::list(TRUE);
+ $languages = Language::getList(TRUE);
asort($languages);
$languages = array_merge(array("" => _("Automatic")), $languages);
$attributesInfo['look_n_feel']['attrs'][0]->setChoices(array_keys($languages), array_values($languages));
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index b57fc5c18..2e4c64cba 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -304,7 +304,9 @@ class user extends simplePlugin
static function getAttributesInfo ()
{
global $config;
- $languages = array_merge(array('' => ''), Language::list(TRUE));
+ $languages = Language::getList(TRUE);
+ asort($languages);
+ $languages = array_merge(array('' => ''), $languages);
$attributesInfo = array(
'perso' => array(
'name' => _('Personal information'),
diff --git a/setup/class_setupStepLanguage.inc b/setup/class_setupStepLanguage.inc
index cdb017189..746634e4a 100644
--- a/setup/class_setupStepLanguage.inc
+++ b/setup/class_setupStepLanguage.inc
@@ -64,7 +64,7 @@ class setupStepLanguage extends setupStep
function execute()
{
- $languages = Language::list(TRUE);
+ $languages = Language::getList(TRUE);
asort($languages);
$languages = array_merge(array("" => _("Automatic")), $languages);
$this->attributesAccess['lang_selected']->setChoices(array_keys($languages), array_values($languages));
--
GitLab