summaryrefslogtreecommitdiff
path: root/modules/menu
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-03-30 15:47:41 -0400
committerDavid Rothstein <drothstein@gmail.com>2013-03-30 15:47:41 -0400
commit79c6205b4c425c3f424e7cca5efcf13dd5c1befa (patch)
tree9871fff615b53c48cafbcd0d15e8fe4664d675bd /modules/menu
parentbbf013472b533c85a06e06fed006abb6d5f08e6a (diff)
downloadbrdo-79c6205b4c425c3f424e7cca5efcf13dd5c1befa.tar.gz
brdo-79c6205b4c425c3f424e7cca5efcf13dd5c1befa.tar.bz2
Issue #1096208 by zambrey, mr.baileys: Fixed PHP notices when creating menu link '#'.
Diffstat (limited to 'modules/menu')
-rw-r--r--modules/menu/menu.admin.inc2
-rw-r--r--modules/menu/menu.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 5ac755e58..68d8e12dc 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -395,7 +395,7 @@ function menu_edit_item_validate($form, &$form_state) {
else {
unset($item['options']['fragment']);
}
- if ($item['link_path'] != $parsed_link['path']) {
+ if (isset($parsed_link['path']) && $item['link_path'] != $parsed_link['path']) {
$item['link_path'] = $parsed_link['path'];
}
}
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index 324ba6766..5fa27c7d1 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -318,7 +318,7 @@ class MenuTestCase extends DrupalWebTestCase {
* @param string $menu_name Menu name.
*/
function addInvalidMenuLink($menu_name = 'navigation') {
- foreach (array('-&-', 'admin/people/permissions') as $link_path) {
+ foreach (array('-&-', 'admin/people/permissions', '#') as $link_path) {
$edit = array(
'link_path' => $link_path,
'link_title' => 'title',