Index: branches/RC/core/units/modules/modules_event_handler.php
===================================================================
diff -u -r10846 -r11623
--- branches/RC/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 10846)
+++ branches/RC/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 11623)
@@ -25,9 +25,8 @@
 			if ($event->Special) {
 				$object->addFilter('current_module', 'Name = '.$event->Special);
 			}
-			if (!$this->Application->isModuleEnabled('Proj-Base')) {
-				$object->addFilter('not_core', 'Name != '.$this->Conn->qstr('Core'));
-			}
+
+			$object->addFilter('not_core', '%1$s.Name <> "Core"');
 		}
 
 		function mapEvents()
@@ -58,25 +57,10 @@
 
 			$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
 
-			if ($event->Name == 'OnMassDecline') {
-				$interface_modules = Array ('In-Portal', 'Proj-Base');
-
-				foreach ($interface_modules as $module_index => $interface_module) {
-					if (!$this->Application->findModule('Name', $interface_module)) {
-						// remove already disabled interface modules
-						unset($interface_modules[$module_index]);
-					}
-				}
-			}
-
 			foreach ($ids as $id) {
-				if ($event->Name == 'OnMassDecline') {
-					if (in_array($id, $interface_modules) && count($interface_modules) == 1) {
-						// don't allow to disable both interface modules
-						continue;
-					}
-
-					unset($interface_modules[ array_search($id, $interface_modules) ]);
+				if (($event->Name == 'OnMassDecline') && ($id == 'In-Portal')) {
+					// don't allow to disable in-portal
+					continue;
 				}
 
 				if ($id == 'Core') {