From fa884b1158b5785fff70d9cc44ac126bcee615d9 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 4 Apr 2010 17:11:20 +0000 Subject: - Patch #759524 by David_Rothstein: toolbar drawer collapsing no longer works without JavaScript. --- modules/toolbar/toolbar.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/toolbar/toolbar.module') diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module index 779351a5b..7c82d09a5 100644 --- a/modules/toolbar/toolbar.module +++ b/modules/toolbar/toolbar.module @@ -109,7 +109,7 @@ function theme_toolbar_toggle($variables) { function _toolbar_is_collapsed() { // PHP converts dots into underscores in cookie names to avoid problems with // its parser, so we use a converted cookie name. - return isset($_COOKIE['Drupal_admin_toolbar_collapsed']) ? $_COOKIE['Drupal_admin_toolbar_collapsed'] : 0; + return isset($_COOKIE['Drupal_toolbar_collapsed']) ? $_COOKIE['Drupal_toolbar_collapsed'] : 0; } /** @@ -142,7 +142,7 @@ function toolbar_pre_render($toolbar) { * Add some page classes, so global page theming can adjust to the toolbar. */ function toolbar_preprocess_html(&$vars) { - if (isset($vars['page_top']['toolbar']) && user_access('access toolbar')) { + if (isset($vars['page']['page_top']['toolbar']) && user_access('access toolbar')) { $vars['classes_array'][] = 'toolbar'; if (!_toolbar_is_collapsed()) { $vars['classes_array'][] = 'toolbar-drawer'; -- cgit v1.2.3