diff --git a/includes/common.inc b/includes/common.inc index 95e03e8..b7f9361 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -4127,6 +4127,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS // Loop through the JavaScript to construct the rendered output. $element = array( '#tag' => 'script', + '#type' => 'html_tag', '#value' => '', '#attributes' => array( 'type' => 'text/javascript', @@ -4141,7 +4142,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS $js_element['#value_prefix'] = $embed_prefix; $js_element['#value'] = 'jQuery.extend(Drupal.settings, ' . drupal_json_encode(drupal_array_merge_deep_array($item['data'])) . ");"; $js_element['#value_suffix'] = $embed_suffix; - $output .= theme('html_tag', array('element' => $js_element)); + $output .= drupal_render($js_element); break; case 'inline': @@ -4152,7 +4153,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS $js_element['#value_prefix'] = $embed_prefix; $js_element['#value'] = $item['data']; $js_element['#value_suffix'] = $embed_suffix; - $processed[$index++] = theme('html_tag', array('element' => $js_element)); + $processed[$index++] = drupal_render($js_element); break; case 'file': @@ -4163,7 +4164,10 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS } $query_string_separator = (strpos($item['data'], '?') !== FALSE) ? '&' : '?'; $js_element['#attributes']['src'] = file_create_url($item['data']) . $query_string_separator . ($item['cache'] ? $query_string : REQUEST_TIME); - $processed[$index++] = theme('html_tag', array('element' => $js_element)); + if (isset($item['browsers'])) { + $js_element['#browsers'] = $item['browsers']; + } + $processed[$index++] = drupal_render($js_element); } else { // By increasing the index for each aggregated file, we maintain @@ -4186,7 +4190,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS $js_element['#attributes']['defer'] = 'defer'; } $js_element['#attributes']['src'] = $item['data']; - $processed[$index++] = theme('html_tag', array('element' => $js_element)); + $processed[$index++] = drupal_render($js_element); break; } } @@ -4201,7 +4205,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS $preprocess_file = file_create_url($uri); $js_element = $element; $js_element['#attributes']['src'] = $preprocess_file; - $processed[$key] = theme('html_tag', array('element' => $js_element)); + $processed[$key] = drupal_render($js_element); } } }