From c17499b6fe5e9b388d09151d2c3525976fde065c Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 12 Aug 2007 16:12:00 +0000 Subject: - Patch #163191 by hswong3i: removed db_num_rows() for compatibility with Oracle and DB2. Also a performance improvement. (Correct version this time.) --- includes/menu.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/menu.inc b/includes/menu.inc index 624ee923b..105697465 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -720,11 +720,13 @@ function menu_tree_page_data($menu_name = 'navigation') { // their children to the list as well. do { $result = db_query("SELECT mlid FROM {menu_links} WHERE menu_name = '%s' AND expanded = 1 AND has_children = 1 AND plid IN (". $placeholders .') AND mlid NOT IN ('. $placeholders .')', array_merge(array($menu_name), $args, $args)); + $num_rows = FALSE; while ($item = db_fetch_array($result)) { $args[] = $item['mlid']; + $num_rows = TRUE; } $placeholders = implode(', ', array_fill(0, count($args), '%d')); - } while ($item); + } while ($num_rows); } array_unshift($args, $menu_name); } -- cgit v1.2.3