commit 16d1f5fa4bb7f53fe7c1b41ad38a269707242e0c Author: Joel Pittet Date: Sat Nov 16 17:16:20 2013 -0800 fix variables not getting in the negotiaion configure form diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index b9e1f79..2bc7509 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -226,11 +226,15 @@ function template_preprocess_language_negotiation_configure_form(&$variables) { } } + // Store and unset configurable so it doesn't print twice in form children. + $configurable = isset($form[$type]['configurable']) ? $form[$type]['configurable'] : NULL; + unset($form[$type]['configurable']); + $variables['language_types'][] = array( 'type' => $type, 'title' => $form[$type]['#title'], 'description' => $form[$type]['#description'], - 'configurable' => isset($form[$type]['configurable']) ? $form[$type]['configurable'] : NULL, + 'configurable' => $configurable, 'table' => $table, 'children' => $form[$type], ); diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 1c3fb0c..d6f0086 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -111,6 +111,7 @@ function language_theme() { return array( 'language_negotiation_configure_form' => array( 'render element' => 'form', + 'file' => 'language.admin.inc', 'template' => 'language-negotiation-configure-form', ), 'language_content_settings_table' => array(