From 030475a7d17f8921aacfb37624769b4f1ad2f6b0 Mon Sep 17 00:00:00 2001
From: Pol Dell'Aiera <Pol@47194.no-reply.drupal.org>
Date: Tue, 5 Jun 2012 17:42:51 +0200
Subject: [PATCH] =?UTF-8?q?=C31555294:=20Vocabulary=20title=20HTML=20entities=20are=20double=20encoded?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/taxonomy/taxonomy.module |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index ee12be7..d7a40c7 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -323,7 +323,7 @@ function taxonomy_menu() {
   );
 
   $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array(
-    'title callback' => 'taxonomy_admin_vocabulary_title_callback',
+    'title callback' => 'taxonomy_admin_vocabulary_set_title',
     'title arguments' => array(3),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('taxonomy_overview_terms', 3),
@@ -382,6 +382,14 @@ function taxonomy_admin_vocabulary_title_callback($vocabulary) {
 }
 
 /**
+ * Return the vocabulary name given the vocabulary object.
+ * This function is now used as a menu item title callback.
+ */
+function taxonomy_admin_vocabulary_set_title($vocabulary) {
+  return $vocabulary->name;
+}
+
+/**
  * Saves a vocabulary.
  *
  * @param $vocabulary
-- 
1.7.3.4

