From 75380e5f327eb57af19754efc25798d5ee98af97 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Mon, 5 Sep 2011 12:08:11 -0700
Subject: [PATCH] Issue #1118016 by dereine, pwolanin: Fixed conditional
visibility of a managed_file() using #states attribute does not work.
---
includes/form.inc | 12 +++++++++++-
modules/file/file.module | 11 ++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/includes/form.inc b/includes/form.inc
index 40363d6a738e..442016af0268 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2796,7 +2796,17 @@ function password_confirm_validate($element, &$element_state) {
*/
function theme_date($variables) {
$element = $variables['element'];
- return '<div class="container-inline">' . drupal_render_children($element) . '</div>';
+
+ $attributes = array();
+ if (isset($element['#id'])) {
+ $attributes['id'] = $element['#id'];
+ }
+ if (!empty($element['#attributes']['class'])) {
+ $attributes['class'] = (array) $element['#attributes']['class'];
+ }
+ $attributes['class'][] = 'container-inline';
+
+ return '<div' . drupal_attributes($attributes) . '>' . drupal_render_children($element) . '</div>';
}
/**
diff --git a/modules/file/file.module b/modules/file/file.module
index 83de0f622aee..4fc9985014e7 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -643,9 +643,18 @@ function file_managed_file_save_upload($element) {
function theme_file_managed_file($variables) {
$element = $variables['element'];
+ $attributes = array();
+ if (isset($element['#id'])) {
+ $attributes['id'] = $element['#id'];
+ }
+ if (!empty($element['#attributes']['class'])) {
+ $attributes['class'] = (array) $element['#attributes']['class'];
+ }
+ $attributes['class'][] = 'form-managed-file';
+
// This wrapper is required to apply JS behaviors and CSS styling.
$output = '';
- $output .= '<div class="form-managed-file">';
+ $output .= '<div' . drupal_attributes($attributes) . '>';
$output .= drupal_render_children($element);
$output .= '</div>';
return $output;
--
GitLab