Merge branch 'feature/filter_status_stack'

centurion-project · Jul 9, 2012 · 2b0a8f9 · 2b0a8f9
2 parents 79f6d3b + 4ee88c7
commit 2b0a8f9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/library/Centurion/Db/Table/Abstract.php b/library/Centurion/Db/Table/Abstract.php
@@ -97,7 +97,7 @@ abstract class Centurion_Db_Table_Abstract extends Zend_Db_Table_Abstract implem
     protected $_traitQueue;
 
     private static $_filtersOn = self::FILTERS_ON;
-    private static $_previousFiltersStatus = self::FILTERS_ON;
+    private static $_previousFiltersStatus = array(self::FILTERS_ON);
 
     public static function getFiltersStatus()
     {
@@ -112,12 +112,17 @@ public static function setFiltersStatus($status)
 
     public static function saveFiltersStatus()
     {
-        self::$_previousFiltersStatus = self::$_filtersOn;
+        self::$_previousFiltersStatus[] = self::$_filtersOn;
+
     }
 
     public static function restoreFiltersStatus()
     {
-        self::$_filtersOn = self::$_previousFiltersStatus;
+        if(count(self::$_previousFiltersStatus)){
+            self::$_filtersOn = array_pop(self::$_previousFiltersStatus);
+        } else{
+            throw new Exception('Error, there are no previous status in the stack');
+        }
     }
 
     public static function switchFiltersStatus()