Skip to content

#9 by @deviantintegral and @pwolanin #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elliotttf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#9 by @deviantintegral and @pwolanin #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32dad6
#9 by @deviantintegral and @pwolanin
elliotttf Feb 22, 2012
d27e70c
Update check for ['menu_admin'] since isset() would have returned TRU…
elliotttf Feb 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions includes/common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,6 +2218,15 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
),
'inline' => array(),
);
// We never cache authenticated user pages, so if they are logged in we
// allow setting of the has_js cookie so batch API functions use the JS
// version.
// user_is_anonymous() is not used here because it is unavailable during
// installation.
// @see user_is_anonymous()
if (!empty($GLOBALS['user']->uid) || !empty($GLOBALS['menu_admin'])) {
$javascript['footer']['inline'][] = array('code' => "document.cookie = 'has_js=1; path=/';", 'defer' => TRUE);
}
}

if (isset($scope) && !isset($javascript[$scope])) {
Expand Down