Changes in inc/admin/class.dc.menu.php [3075:2efd73dc6db6:2566:9bf417837888]

File:

• inc/admin/class.dc.menu.php (modified) (3 diffs)

inc/admin/class.dc.menu.php

@@ -22 +22 @@
           $this->title = $title;
           $this->itemSpace = $itemSpace;
-          $this->pinned = array();
           $this->items = array();
      }
 
-     public function addItem($title,$url,$img,$active,$show=true,$id=null,$class=null,$pinned=false)
+     public function addItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
      {
           if($show) {
-               $item = $this->itemDef($title,$url,$img,$active,$id,$class);
-               if ($pinned) {
-                    $this->pinned[] = $item;
-               } else {
-                    $this->items[$title] = $item;
-               }
+               $this->items[] = $this->itemDef($title,$url,$img,$active,$id,$class);
           }
      }
 
-     public function prependItem($title,$url,$img,$active,$show=true,$id=null,$class=null,$pinned=false)
+     public function prependItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
      {
           if ($show) {
-               $item = $this->itemDef($title,$url,$img,$active,$id,$class);
-               if ($pinned) {
-                    array_unshift($this->pinned,$item);
-               } else {
-                    $this->items[$title] = $item;
-               }
+               array_unshift($this->items,$this->itemDef($title,$url,$img,$active,$id,$class));
           }
      }
@@ -52 +41 @@
      public function draw()
      {
-          if (count($this->items) + count($this->pinned) == 0) {
+          if (count($this->items) == 0) {
                return '';
           }
@@ -61 +50 @@
           '<ul>'."\n";
 
-          // 1. Display pinned items (unsorted)
-          for ($i=0; $i<count($this->pinned); $i++)
+          for ($i=0; $i<count($this->items); $i++)
           {
-               if ($i+1 < count($this->pinned) && $this->itemSpace != '') {
-                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$this->pinned[$i]);
+               if ($i+1 < count($this->items) && $this->itemSpace != '') {
+                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$this->items[$i]);
                     $res .= "\n";
                } else {
-                    $res .= $this->pinned[$i]."\n";
+                    $res .= $this->items[$i]."\n";
                }
-          }
-
-          // 2. Display unpinned itmes (sorted)
-          $i = 0;
-          dcUtils::lexicalKeySort($this->items);
-          foreach ($this->items as $title => $item)
-          {
-               if ($i+1 < count($this->items) && $this->itemSpace != '') {
-                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$item);
-                    $res .= "\n";
-               } else {
-                    $res .= $item."\n";
-               }
-               $i++;
           }