Merge branches 'ILIKE', 'brokensession', 'autologout', 'oop' and 'slave-table'

[infodrom/hallinta] / lib / menu.php

diff --git a/lib/menu.php b/lib/menu.php
index d453856..740d60d 100644 (file)
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -23,21 +23,21 @@ function menu()
     . "WHERE sys_group_mask.gid = ".$_SESSION['sys']['group']." "
     . "AND shadow = 0 "
     . "ORDER BY sys_menu.priority,sys_menu.name,sys_mask.priority,sys_mask.menutitle";
-  $sth = $db->query($sql);
+  $list = $db->fetchObjectList($sql);
 
-  if ($sth) {
+  if (count($list)) {
     $menu = 'Start';
 
-    while ($row = $sth->fetch()) {
-      if ($menu != $row['name']) {
+    foreach ($list as $row) {
+      if ($menu != $row->name) {
        $ret .= '</ul></li>';
-       $ret .= sprintf('<li class="dir">%s', $row['name']);
+       $ret .= sprintf('<li class="dir">%s', $row->name);
        $ret .= '<ul>';
-       $menu = $row['name'];
+       $menu = $row->name;
       }
-      $ret .= sprintf('<li><a href="./?mask=%s"%s>%s</a></li>', str_replace('|','__',$row['fname']),
-                     empty($row['title']) ? '' : ' title="'.$row['title'].'"',
-                     $row['menutitle']);
+      $ret .= sprintf('<li><a href="./?mask=%s"%s>%s</a></li>', str_replace('|','__',$row->fname),
+                     empty($row->title) ? '' : ' title="'.$row->title.'"',
+                     $row->menutitle);
     }
     $ret .= '</ul>';
     $ret .= '</li>';