Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -N -r15124 -r15214 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 15124) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 15214) @@ -187,3 +187,5 @@ # ===== v 5.2.0-B2 ===== UPDATE Link main_table SET main_table.CachedReviewsQty = (SELECT COUNT(*) FROM <%TABLE_PREFIX%>CatalogReviews review_table WHERE review_table.ItemId = main_table.ResourceId); + +# ===== v 5.2.0-B3 ===== Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r15150 -r15214 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15150) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15214) @@ -1,6 +1,6 @@ Application->getUnitOption('l', 'TableName').' WHERE ResourceId = '.$object->GetDBField('ItemResourceId'); - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE', $this->Conn->GetOne($sql)); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE'); + $this->Application->EmailEventUser('LINK.ENHANCE', $this->Conn->GetOne($sql)); + $this->Application->EmailEventAdmin('LINK.ENHANCE'); break; } @@ -569,8 +569,8 @@ $sql = 'SELECT CreatedById FROM ' . $this->Application->getUnitOption('l', 'TableName') . ' WHERE ResourceId = ' . $object->GetDBField('ItemResourceId'); - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.DENY', $this->Conn->GetOne($sql)); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.DENY'); + $this->Application->EmailEventUser('LINK.ENHANCE.DENY', $this->Conn->GetOne($sql)); + $this->Application->EmailEventAdmin('LINK.ENHANCE.DENY'); } } } @@ -688,8 +688,8 @@ $sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').' WHERE ResourceId = '.$object->GetDBField('ItemResourceId'); - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.EXTEND', $this->Conn->GetOne($sql)); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.EXTEND'); + $this->Application->EmailEventUser('LINK.ENHANCE.EXTEND', $this->Conn->GetOne($sql)); + $this->Application->EmailEventAdmin('LINK.ENHANCE.EXTEND'); } /** @@ -747,8 +747,8 @@ $sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').' WHERE ResourceId = '.$object->GetDBField('ItemResourceId'); - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.EXPIRE', $this->Conn->GetOne($sql)); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.EXPIRE'); + $this->Application->EmailEventUser('LINK.ENHANCE.EXPIRE', $this->Conn->GetOne($sql)); + $this->Application->EmailEventAdmin('LINK.ENHANCE.EXPIRE'); } } @@ -766,8 +766,8 @@ $listing_ids = Array(); foreach($res as $record) { - $email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.RENEWAL.NOTICE', $record['CreatedById']); - $email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.RENEWAL.NOTICE'); + $this->Application->EmailEventUser('LINK.ENHANCE.RENEWAL.NOTICE', $record['CreatedById']); + $this->Application->EmailEventAdmin('LINK.ENHANCE.RENEWAL.NOTICE'); $listing_ids[] = $record['ListingId']; } $sql = 'UPDATE '.$this->Application->getUnitOption($event->Prefix, 'TableName').' Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -N -r15199 -r15214 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 15199) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 15214) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.3'), '5.2.0-B1' => Array ('Core' => '5.2.0-B1'), '5.2.0-B2' => Array ('Core' => '5.2.0-B2'), + '5.2.0-B3' => Array ('Core' => '5.2.0-B3'), ); } Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15150 -r15214 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15150) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15214) @@ -1,6 +1,6 @@ $object->GetField('Name'), ); - $email_event =& $this->Application->EmailEventUser('LINK.CONTACTFORM', $object->GetDBField('CreatedById'), $send_params); + $email_sent = $this->Application->EmailEventUser('LINK.CONTACTFORM', $object->GetDBField('CreatedById'), $send_params); - if ($email_event->status == kEvent::erSUCCESS) { + if ( $email_sent ) { $event->redirect = $this->Application->GetVar('success_template'); $redirect_params = Array (