diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-09-09 21:33:00 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-09-09 21:33:00 +0000 |
| commit | d440fc540fd2bbc4a783a9cbb8efb131fe92a8c2 (patch) | |
| tree | 6ec4a22e4c670803967483fcf880abf083467eb6 | |
| parent | c33da192c13a357bf0c75bd556457da78f991a68 (diff) | |
| download | brdo-d440fc540fd2bbc4a783a9cbb8efb131fe92a8c2.tar.gz brdo-d440fc540fd2bbc4a783a9cbb8efb131fe92a8c2.tar.bz2 | |
- Patch #473240 by Arancaytar, c960657: menu_get_names() crashed when called.
| -rw-r--r-- | includes/menu.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/menu.test | 7 |
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() { |