diff --git a/chosen.module b/chosen.module index 33fea32..9c3c2a6 100644 --- a/chosen.module +++ b/chosen.module @@ -180,10 +180,13 @@ function chosen_element_info_alter(&$info) { */ function chosen_pre_render_select($element) { $field_info = isset($element['#field_name']) ? field_info_field($element['#field_name']) : FALSE; - $is_admin = path_is_admin(current_path()) || current_path() == 'system/ajax'; + // Exclude chosen from admin pages. - if ($is_admin && !variable_get('chosen_admin_pages', TRUE)) { - return $element; + if (!variable_get('chosen_admin_pages', TRUE)) { + global $theme; + if ($theme == variable_get('admin_theme', '')) { + return $element; + } } $element_name = $element['#name'];