- Patch #759524 by David_Rothstein: toolbar drawer collapsing no longer works without JavaScript.

2 files changed, 3 insertions, 3 deletions

diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css
index 16f8f623f..5fc8159ba 100644
--- a/modules/toolbar/toolbar.css
+++ b/modules/toolbar/toolbar.css
@@ -5,7 +5,7 @@ body.toolbar {
 }
 
 body.toolbar-drawer {
-  padding-top: 6.6em;
+  padding-top: 5.3em;
 }
 
 /**
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';