Changeset 2379 in ExiteCMS

Timestamp:

07/10/11 14:00:17 (11 months ago)

Author:

WanWizard

Message:

fixed submenu's not properly ordered in the link list

File:

• trunk/includes/menu_include.php (modified) (3 diffs)

trunk/includes/menu_include.php

@@ -98 +98 @@
 
     // get all menu records for this panel and this parent
-    $result = dbquery("SELECT * FROM ".$db_prefix."site_links ".$where." ORDER BY link_order");
+    $result = dbquery("SELECT * FROM ".$db_prefix."site_links ".$where." ORDER BY link_parent ASC, link_order ASC");
     // process the results
-    $total = dbrows($result);
-    $current = 0;
+    $current = $start = count($linkinfo);
     while($data = dbarray($result)) {
         // only include records that the user is allowed to see (unless showall is specified)
         if ($no_sec || checkgroup($data['link_visibility'])) {
             // true if this is the first menu item
-            $data['menu_first'] = $current == 0 ? 1 : 0;
+            $data['menu_first'] = $current == $start ? 1 : 0;
             // for the first menu item, check if there's a menu_state cookie stored for this menu
             $data['div_state'] = -1;
@@ -133 +132 @@
             // get the name of the user group attached to this link
             $data['link_visibility_name'] = getgroupname($data['link_visibility'], '-1');
-            $data['has_submenu'] = 0;
+            $data['has_submenu'] = false;
             $linkinfo[$current] = $data;
             $current++;
@@ -145 +144 @@
     }
 
-    // set the flag of the last menu entry
-    isset($linkinfo[$current-1]) && $linkinfo[$current-1]['menu_last'] = 1;
-
-    return ($total == 0 ? 0 : 1);
+    // any entries found?
+    if ($current != $start) {
+        // set the flag of the last menu entry
+        $linkinfo[$current-1]['menu_last'] = 1;
+        return true;
+    } else {
+        return false;
+    }
 }
 ?>