- fixing recently introduced sorting issue, refactoring, cleaning up the generic filters concept by removing the automatic sorting of data

- fixing issue when executing unit tests would invalidate tmp/cache/tracker files
- fixed edge case issue when calling several apis from one http request, and requesting recursive output, it was failing in some random cases
- adding a unit test that calls all callable api methods and check for non empty output
- 

1 files changed, 6 insertions, 2 deletions

diff --git a/libs/Event/Dispatcher.php b/libs/Event/Dispatcher.php
index 6e6a72eb21..92d3c52d88 100755
--- a/libs/Event/Dispatcher.php
+++ b/libs/Event/Dispatcher.php
@@ -212,7 +212,9 @@ class Event_Dispatcher
                     $objClass = get_class($notification->getNotificationObject());
                     if (empty($class) || strcasecmp($class, $objClass) == 0) {
                         call_user_func_array($callback, array(&$notification));
-                        $notification->increaseNotificationCount();
+                        //-- Piwik Hack --//
+	                    $notification->increaseNotificationCount(get_class($callback[0]), $callback[1]);
+	                    //-- End Piwik Hack --//
                     }
                 }
             }
@@ -295,7 +297,9 @@ class Event_Dispatcher
                 if (empty($rObserver['class']) || 
                 	strcasecmp($rObserver['class'], $objClass) == 0) {
                     call_user_func_array($rObserver['callback'], array(&$notification));
-                    $notification->increaseNotificationCount();
+                    //-- Piwik Hack --//
+                    $notification->increaseNotificationCount(get_class($rObserver['callback'][0]), $rObserver['callback'][1]);
+                    //-- End Piwik Hack --//
                 }
             }
         }