Index: branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php
===================================================================
diff -u -r7036 -r7042
--- branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php	(.../event_manager.php)	(revision 7036)
+++ branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php	(.../event_manager.php)	(revision 7042)
@@ -250,8 +250,16 @@
 
 			$passed = explode(',', $this->Application->GetVar('passed'));
 
+
 			foreach ($events as $prefix_special => $event_name) {
 				if (!$event_name) continue;
+				$prefix_special = explode('.',$prefix_special);
+				array_push($passed, $prefix_special[0]);
+			}
+			$this->Application->SetVar('passed', implode(',', $passed));
+
+			foreach ($events as $prefix_special => $event_name) {
+				if (!$event_name) continue;
 				if (is_array($event_name)) {
 					$event_name = key($event_name);
 					$events[$prefix_special] = $event_name;
@@ -264,7 +272,7 @@
 
 				$prefix_special = explode('.',$prefix_special);
 				$event->Prefix = $prefix_special[0];
-				array_push($passed, $prefix_special[0]);
+//				array_push($passed, $prefix_special[0]);
 				$event->Special = isset($prefix_special[1]) ? $prefix_special[1] : '';
 
 				$event->redirect_params = Array('opener' => 's', 'pass' => 'all');
@@ -307,7 +315,7 @@
 			}
 
 			$this->Application->SetVar('events', $events);
-			$this->Application->SetVar('passed', implode(',', $passed));
+//			$this->Application->SetVar('passed', implode(',', $passed));
 		}
 
 		function processOpener()