From 3254e88fdef94b82012f0ff5c7f3fd55a4766361 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 8 Dec 2009 07:09:43 +0000
Subject: [PATCH] #651712 by carlos8f: Fixed bug where rendered menu tree links
 do not include proper attributes (with tests).

---
 includes/menu.inc                  |  2 +-
 modules/simpletest/tests/menu.test | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/includes/menu.inc b/includes/menu.inc
index d16f3005883..711642547c2 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -921,7 +921,7 @@ function menu_tree_output($tree) {
     $element['#attributes']['class'] = $class;
     $element['#title'] = $data['link']['title'];
     $element['#href'] = $data['link']['href'];
-    $element['#localized_options'] = !empty($data['localized_options']) ? $data['localized_options'] : array();
+    $element['#localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : array();
     $element['#below'] = $data['below'] ? menu_tree_output($data['below']) : $data['below'];
     $element['#original_link'] = $data['link'];
     // Index using the link's unique mlid.
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index 0ff063ae88e..475dac3346f 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -240,6 +240,31 @@ class MenuIncTestCase extends DrupalWebTestCase {
     $this->assertEqual(menu_test_static_variable(), 'delete', t('hook_menu_link_delete() fired correctly'));
   }
 
+  /**
+   * Test menu link 'options' storage and rendering.
+   */
+  function testMenuLinkOptions() {
+    // Create a menu link with options.
+    $menu_link = array(
+      'link_title' => 'Menu link options test',
+      'link_path' => 'node',
+      'module' => 'menu_test',
+      'options' => array(
+        'attributes' => array(
+          'title' => 'Test title attribute',
+        ),
+        'query' => array(
+          'testparam' => 'testvalue',
+        ),
+      ),
+    );
+    menu_link_save($menu_link);
+
+    // Load front page.
+    $this->drupalGet('node');
+    $this->assertRaw('title="Test title attribute"', t('Title attribute of a menu link renders.'));
+    $this->assertRaw('testparam=testvalue', t('Query parameter added to menu link.'));
+  }
 }
 
 /**