Fix broken call of language_list

backdrop-contrib · Mar 6, 2020 · 83ac846 · 83ac846
1 parent fab41a3
commit 83ac846
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/i18n.module b/i18n.module
@@ -244,9 +244,9 @@ function i18n_language_field_extra() {
  *
  * @todo See about creating a permission for seeing disabled languages
  */
-function i18n_language_list($field = 'name', $mode = NULL) {
+function i18n_language_list($mode = NULL) {
   $mode = isset($mode) ? $mode : config_get('i18n.settings', 'i18n_language_list');
-  return language_list($field, I18N_LANGUAGE_EXTENDED & $mode);
+  return language_list(($mode == I18N_LANGUAGE_ENABLED), TRUE);
 }
 
 /**

diff --git a/i18n_node/i18n_node.module b/i18n_node/i18n_node.module
@@ -167,14 +167,8 @@ function i18n_node_language_list($node, $translate = FALSE, $select = FALSE) {
   $languages = node_invoke($node, 'language_list', $translate);
 
   if (!$languages) {
-    // FIXME: workaround until #9 is addressed.
-    // @see https://github.com/backdrop-contrib/i18n/issues/9
-    //$languages = i18n_language_list('name', i18n_node_language_mode($node));
     $mode = config_get('i18n.settings', "i18n_node_type_{$node->type}.extended");
-    if (!$mode) {
-      $mode = config_get('i18n.settings', 'i18n_language_list');
-    }
-    $languages = language_list(($mode < I18N_LANGUAGE_EXTENDED), TRUE);
+    $languages = i18n_language_list($mode);
 
     if ($translate && isset($node->tnid) && $node->tnid && ($translations = translation_node_get_translations($node->tnid))) {
       unset($translations[$node->langcode]);