From 79c6205b4c425c3f424e7cca5efcf13dd5c1befa Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Sat, 30 Mar 2013 15:47:41 -0400
Subject: Issue #1096208 by zambrey, mr.baileys: Fixed PHP notices when
 creating menu link '#'.

---
 modules/menu/menu.admin.inc | 2 +-
 modules/menu/menu.test      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/menu')

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',
-- 
cgit v1.2.3