summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-03-21 08:32:24 +0000
committerDries Buytaert <dries@buytaert.net>2008-03-21 08:32:24 +0000
commit97ffcabe56f5788860b1230e5c7b53be0f3cc42d (patch)
tree6b1598744b1d7999e223da2d02c8fa32d0b16f11
parent2001e53c77b1310c9f33768a4d4373cf8b43769f (diff)
downloadbrdo-97ffcabe56f5788860b1230e5c7b53be0f3cc42d.tar.gz
brdo-97ffcabe56f5788860b1230e5c7b53be0f3cc42d.tar.bz2
- Patch #220827 by Arancaytar et al: menu system phpdoc improvements.
-rw-r--r--includes/menu.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 31e3fdc01..235fd9f8c 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1736,8 +1736,7 @@ function _menu_navigation_links_rebuild($menu) {
}
$placeholders = db_placeholders($menu, 'varchar');
$paths = array_keys($menu);
- // Updated items and customized items which router paths are gone need new
- // router paths.
+ // Updated and customized items whose router paths are gone need new ones.
$result = db_query("SELECT ml.link_path, ml.mlid, ml.router_path, ml.updated FROM {menu_links} ml WHERE ml.updated = 1 OR (router_path NOT IN ($placeholders) AND external = 0 AND customized = 1)", $paths);
while ($item = db_fetch_array($result)) {
$router_path = _menu_find_router_path($menu, $item['link_path']);
@@ -1748,7 +1747,7 @@ function _menu_navigation_links_rebuild($menu) {
db_query("UPDATE {menu_links} SET router_path = '%s', updated = %d WHERE mlid = %d", $router_path, $updated, $item['mlid']);
}
}
- // Find any items where their router path does not exist any more.
+ // Find any item whose router path does not exist any more.
$result = db_query("SELECT * FROM {menu_links} WHERE router_path NOT IN ($placeholders) AND external = 0 AND updated = 0 AND customized = 0 ORDER BY depth DESC", $paths);
// Remove all such items. Starting from those with the greatest depth will
// minimize the amount of re-parenting done by menu_link_delete().