From d5a73be1456758b8d43d068160f33ea543cab336 Mon Sep 17 00:00:00 2001
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Date: Wed, 16 Mar 2011 22:56:12 -0400
Subject: [PATCH] Issue #1095498 by ohnobinki: Fix toolbar toggle link rendered without escaping ampersand as an html entity.

---
 modules/toolbar/toolbar.module |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index 397639e..61ae648 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -95,7 +95,7 @@ function theme_toolbar_toggle($variables) {
     $toggle_text = t('Hide shortcuts');
     $variables['attributes']['class'][] = 'toggle-active';
   }
-  return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' .  drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>';
+  return l($toggle_text, 'toolbar/toggle', array('query' => drupal_get_destination(), 'attributes' => array('title' => $toggle_text) + $variables['attributes']));
 }
 
 /**
-- 
1.7.3.4