summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/menu.inc2
-rw-r--r--modules/simpletest/tests/menu.test7
2 files changed, 8 insertions, 1 deletions
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
@@ -76,6 +76,13 @@ class MenuIncTestCase extends DrupalWebTestCase {
}
/**
+ * 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().
*/
function testMenuName() {