From d440fc540fd2bbc4a783a9cbb8efb131fe92a8c2 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 9 Sep 2009 21:33:00 +0000
Subject: - Patch #473240 by Arancaytar, c960657: menu_get_names() crashed when
 called.

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

diff --git a/includes/menu.inc b/includes/menu.inc
index 261db8610..3a3ef9306 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1373,7 +1373,7 @@ function menu_get_names() {
   if (empty($names)) {
     $names = db_select('menu_links')
       ->distinct()
-      ->fields('menu_links', 'menu_name')
+      ->fields('menu_links', array('menu_name'))
       ->orderBy('menu_name')
       ->execute()->fetchCol();
   }
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index 34b3f4930..f373eb8f1 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -75,6 +75,13 @@ class MenuIncTestCase extends DrupalWebTestCase {
     $this->assertLink(t('Menu link #2'), 0, t('Found menu link #2'));
   }
 
+  /**
+   * Test menu_get_names().
+   */
+  function testMenuGetNames() {
+    $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'main-menu', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.'));
+  }
+
   /**
    * Tests for menu_name parameter for hook_menu().
    */
-- 
cgit v1.2.3