From 246334f30d63a468dcb564703b4ca27a4c22d3d3 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Fri, 1 Sep 2006 08:44:25 +0000
Subject: [PATCH] Don't include drupal.js if there is no JS on the page
---
includes/common.inc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/includes/common.inc b/includes/common.inc
index 73839d2d3657..c4d17485f0bd 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1363,15 +1363,21 @@ function drupal_get_css($css = NULL) {
* far for $scope is returned.
*/
function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer = FALSE, $cache = TRUE) {
+ if (!is_null($data)) {
+ _drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
+ _drupal_add_js('misc/drupal.js', 'core', 'header', FALSE, $cache);
+ }
+ return _drupal_add_js($data, $type, $scope, $defer, $cache);
+}
+
+/**
+ * Helper function for drupal_add_js().
+ */
+function _drupal_add_js($data, $type, $scope, $defer, $cache) {
static $javascript = array();
if (!isset($javascript[$scope])) {
$javascript[$scope] = array('core' => array(), 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array());
-
- if (empty($javascript['header']['core']['misc/drupal.js'])) {
- drupal_add_js('misc/jquery.js', 'core', 'header', FALSE, $cache);
- drupal_add_js('misc/drupal.js', 'core', 'header', FALSE, $cache);
- }
}
if (!isset($javascript[$scope][$type])) {
--
GitLab