Index: trunk/core/units/modules/modules_event_handler.php
===================================================================
diff -u -N -r6625 -r7635
--- trunk/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 6625)
+++ trunk/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 7635)
@@ -21,10 +21,13 @@
 		 */
 		function SetCustomQuery(&$event)
 		{
+			$object =& $event->getObject();
 			if ($event->Special) {
-				$object =& $event->getObject();
 				$object->addFilter('current_module', 'Name = '.$event->Special);
 			}
+			if (!$this->Application->isModuleEnabled('Proj-Base')) {
+				$object->addFilter('not_core', 'Name != '.$this->Conn->qstr('Core'));
+			}
 		}
 
 		function mapEvents()
@@ -61,7 +64,7 @@
 
 				if ($object->Update()) {
 					$event->status = erSUCCESS;
-					$event->redirect_params = Array('opener' => 's', 'pass_events' => true); //stay!
+					$event->redirect_params = Array('opener' => 's'); //stay!
 				}
 				else {
 					$event->status = erFAIL;