From 4095b6cf996eb6c5da7e99f7dfb5801636f1a7dd Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 22 Apr 2010 10:09:27 +0000
Subject: [PATCH] #777150 by jpmckinney, realityloop: Fixed Strict warning on
the reports screen.
---
includes/menu.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/includes/menu.inc b/includes/menu.inc
index 4b5ca3aedd88..39f7dddade90 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -860,7 +860,7 @@ function menu_get_object($type = 'node', $position = 1, $path = NULL) {
* Render a menu tree based on the current path.
*
* The tree is expanded based on the current path and dynamic paths are also
- * changed according to the defined to_arg functions (for example the 'My
+ * changed according to the defined to_arg functions (for example the 'My
* account' link is changed from user/% to a link with the current user's uid).
*
* @param $menu_name
@@ -2104,7 +2104,8 @@ function menu_set_active_trail($new_trail = NULL) {
$found[] = $menu->menu_name;
}
// The $menu_names array is ordered, so take the first one that matches.
- $name = current(array_intersect($menu_names, $found));
+ $found_menu_names = array_intersect($menu_names, $found);
+ $name = current($found_menu_names);
if ($name !== FALSE) {
$tree = menu_tree_page_data($name);
list($key, $curr) = each($tree);
--
GitLab