From c1dbd83e407152840f3c9244e1997a2402668781 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 28 Nov 2005 15:45:04 +0000
Subject: - Patch #11758 by Richard Archer: fixed mbstring clash.

---
 includes/menu.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index 6ff5e0d8a..3cf574cf7 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1176,10 +1176,12 @@ function _menu_find_parents(&$items) {
     if (!isset($item['pid'])) {
       // Parent's location has not been customized, so figure it out using the path.
       $parent = $item['path'];
-      do {
-        $parent = substr($parent, 0, strrpos($parent, '/'));
+      if ($parent) {
+        do {
+          $parent = substr($parent, 0, strrpos($parent, '/'));
+        }
+        while ($parent && !array_key_exists($parent, $_menu['path index']));
       }
-      while ($parent && !array_key_exists($parent, $_menu['path index']));
 
       $pid = $parent ? $_menu['path index'][$parent] : 1;
       $_menu['items'][$mid]['pid'] = $pid;
-- 
cgit v1.2.3