From b94665f5aec34875c61ac28db847b104026b429e Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 26 Apr 2010 14:06:23 +0000
Subject: - Patch #688334 by stella, BTMash, carlos8f, chx: fixed file
 inheritance is broken.

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

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index 39f7dddad..8c2255067 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -3166,12 +3166,15 @@ function _menu_router_build($callbacks) {
           if (!isset($item['page arguments']) && isset($parent['page arguments'])) {
             $item['page arguments'] = $parent['page arguments'];
           }
-          if (!isset($item['file']) && isset($parent['file'])) {
-            $item['file'] = $parent['file'];
-          }
           if (!isset($item['file path']) && isset($parent['file path'])) {
             $item['file path'] = $parent['file path'];
           }
+          if (!isset($item['file']) && isset($parent['file'])) {
+            $item['file'] = $parent['file'];
+            if (empty($item['file path']) && isset($item['module']) && isset($parent['module']) && $item['module'] != $parent['module']) {
+              $item['file path'] = drupal_get_path('module', $parent['module']);
+            }
+          }
         }
         // Same for delivery callbacks.
         if (!isset($item['delivery callback']) && isset($parent['delivery callback'])) {
-- 
cgit v1.2.3