Index: branches/5.2.x/core/units/helpers/priority_helper.php
===================================================================
diff -u -N -r15145 -r15262
--- branches/5.2.x/core/units/helpers/priority_helper.php	(.../priority_helper.php)	(revision 15145)
+++ branches/5.2.x/core/units/helpers/priority_helper.php	(.../priority_helper.php)	(revision 15262)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: priority_helper.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: priority_helper.php 15262 2012-04-03 11:12:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -182,8 +182,11 @@
 		{
 			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 			$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-			$constrain = $this->normalizeConstrain($constrain);
 
+			if ( $constrain ) {
+				$constrain = $this->normalizeConstrain($constrain);
+			}
+
 			if ( $this->Application->IsTempMode($event->Prefix, $event->Special) ) {
 				$table_name = $this->Application->GetTempName($table_name, 'prefix:' . $event->Prefix);
 			}
Index: branches/5.2.x/core/units/priorites/priority_eh.php
===================================================================
diff -u -N -r15145 -r15262
--- branches/5.2.x/core/units/priorites/priority_eh.php	(.../priority_eh.php)	(revision 15145)
+++ branches/5.2.x/core/units/priorites/priority_eh.php	(.../priority_eh.php)	(revision 15262)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: priority_eh.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: priority_eh.php 15262 2012-04-03 11:12:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -390,6 +390,7 @@
 	{
 		$constrain_event = new kEvent($event->MasterEvent->getPrefixSpecial() . ':OnGetConstrainInfo');
 		$constrain_event->setEventParam('actual_event', $event->Name);
+		$constrain_event->setEventParam('original_special', $event->MasterEvent->Special);
 		$constrain_event->setEventParam('original_event', $event->MasterEvent->Name);
 		$this->Application->HandleEvent($constrain_event);