Commit 94717766 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

🚑 fix(language) list is a reserved word, use getList instead

issue #5820
parent 4312278b
......@@ -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(
......
......@@ -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));
......
......@@ -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'),
......
......@@ -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));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment