Some rewriting, TODOs.txt updated:

[hub.git] / application / hub / main / lists / class_BaseList.php

diff --git a/application/hub/main/lists/class_BaseList.php b/application/hub/main/lists/class_BaseList.php
index 5efe2baab27680566c38980eb4e7225aa675e9a0..a484879959ee3e4153d7d3eac3e0f87bca92086f 100644 (file)
--- a/application/hub/main/lists/class_BaseList.php
+++ b/application/hub/main/lists/class_BaseList.php
@@ -59,8 +59,17 @@ class BaseList extends BaseHubSystem implements IteratorAggregate, Countable {
         * @return      $iteratorInstance       An instance of a Iterator class
         */
        public function getIterator () {
-               // Prepare a default iterator
-               $iteratorInstance = ObjectFactory::createObjectByConfiguredName('default_iterator_class', array($this));
+               // Get iterator from here
+               $iteratorInstance = $this->getIteratorInstance();
+
+               // Is the instance set?
+               if (is_null($iteratorInstance)) {
+                       // Prepare a default iterator
+                       $iteratorInstance = ObjectFactory::createObjectByConfiguredName('default_iterator_class', array($this));
+
+                       // Set it here
+                       $this->setIteratorInstance($iteratorInstance);
+               } // END - if
 
                // And return it
                return $iteratorInstance;