Jelajahi Sumber

Changed the way a container converts to an array, now with respecting sorting order: fixing issues ZF-8313, ZF-8337

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19178 44c647ce-9c0f-0410-b52a-842ac1e357ba
dragonbe 16 tahun lalu
induk
melakukan
b4d95814fc
1 mengubah file dengan 6 tambahan dan 4 penghapusan
  1. 6 4
      library/Zend/Navigation/Container.php

+ 6 - 4
library/Zend/Navigation/Container.php

@@ -369,11 +369,13 @@ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable
     public function toArray()
     {
         $pages = array();
-
-        foreach ($this->_pages as $page) {
-            $pages[] = $page->toArray();
+        
+        $this->_dirtyIndex = true;
+        $this->_sort();
+        $indexes = array_keys($this->_index);
+        foreach ($indexes as $hash) {
+            $pages[] = $this->_pages[$hash]->toArray();
         }
-
         return $pages;
     }