Index: branches/5.2.x/core/units/forms/forms/forms_eh.php
===================================================================
diff -u -N -r15065 -r15130
--- branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 15065)
+++ branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 15130)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_eh.php 15065 2012-01-17 15:11:29Z alex $
+* @version	$Id: forms_eh.php 15130 2012-03-03 18:38:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -35,7 +35,7 @@
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
-	function OnCreateSubmissionNodes(&$event)
+	function OnCreateSubmissionNodes($event)
 	{
 		if (defined('IS_INSTALL') && IS_INSTALL) {
 			// skip any processing, because Forms table doesn't exists until install is finished
@@ -99,7 +99,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
@@ -118,7 +118,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnMassDelete(kEvent &$event)
+	protected function OnMassDelete(kEvent $event)
 	{
 		parent::OnMassDelete($event);
 
@@ -129,8 +129,7 @@
 
 	function _deleteSectionCache()
 	{
-		$reset_event = new kEvent('adm:OnResetSections');
-		$this->Application->HandleEvent($reset_event);
+		$this->Application->HandleEvent(new kEvent('adm:OnResetSections'));
 
 		$this->Application->StoreVar('RefreshStructureTree', 1);
 	}
@@ -140,7 +139,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCreateFormFields(&$event)
+	function OnCreateFormFields($event)
 	{
 		$cur_fields = $this->Conn->Query('DESCRIBE '.TABLE_PREFIX.'FormSubmissions', 'Field');
 		$cur_fields = array_keys($cur_fields);
@@ -180,7 +179,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnFormSubmit(&$event)
+	protected function OnFormSubmit($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -242,7 +241,7 @@
 
 			if ( $field_values['MailingList'] ) {
 				$this->Application->StoreVar('SubscriberEmail', $field_values['Email']);
-				$this->Application->HandleEvent($sub_event, 'u:OnSubscribeUser', Array ('no_unsubscribe' => 1));
+				$this->Application->HandleEvent(new kEvent('u:OnSubscribeUser', Array ('no_unsubscribe' => 1)));
 			}
 		}
 		else {
@@ -257,7 +256,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -271,7 +270,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -283,7 +282,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function itemChanged(&$event)
+	function itemChanged($event)
 	{
 		$this->_validatePopSettings($event);
 		$this->_disableSecurityImage($event);
@@ -295,7 +294,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _validatePopSettings(&$event)
+	function _validatePopSettings($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -355,7 +354,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _setRequired(&$event)
+	function _setRequired($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -378,7 +377,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _disableSecurityImage(&$event)
+	function _disableSecurityImage($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -393,7 +392,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessReplies(&$event)
+	function OnProcessReplies($event)
 	{
 		$this->_processMailbox($event, false);
 	}
@@ -403,7 +402,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessBouncedReplies(&$event)
+	function OnProcessBouncedReplies($event)
 	{
 		$this->_processMailbox($event, true);
 	}
@@ -414,7 +413,7 @@
 	 * @param kEvent $event
 	 * @param bool $bounce_mode
 	 */
-	function _processMailbox(&$event, $bounce_mode = false)
+	function _processMailbox($event, $bounce_mode = false)
 	{
 		$this->Application->SetVar('client_mode', 1);