Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== diff -u -N -r15141 -r15149 --- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15141) +++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15149) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->IgnoreValidation = true; @@ -197,7 +197,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $shipping_address_id = $this->Application->GetVar('shipping_address_id'); @@ -322,7 +322,7 @@ $this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $order_id); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // set user id to object, since it will be used during order update from OnRecalculateItems event @@ -441,7 +441,7 @@ $this->ReserveItems($event); - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ $charge_result = $this->ChargeOrder($order); @@ -528,7 +528,7 @@ */ function setBillingAddress($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ if ( $object->HasTangibleItems() ) { @@ -591,7 +591,7 @@ { $this->OnUpdateCart($event); if ( !$event->getEventParam('RecalculateChangedCart') ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ if ( !$object->HasTangibleItems() ) { @@ -669,7 +669,7 @@ if ( $items_info ) { list($id, $field_values) = each($items_info); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $payment_type_id = $object->GetDBField('PaymentType'); @@ -697,7 +697,7 @@ */ protected function OnCancelRecurring($event) { - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ $order->SetDBField('IsRecurringBilling', 0); @@ -719,7 +719,7 @@ { parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $cvv2 = $object->GetDBField('PaymentCVV2'); @@ -755,7 +755,7 @@ } else { // strange: recalculate total amount on error - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $object->SetDBField('TotalAmount', $object->getTotalAmount()); @@ -773,7 +773,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $addr_list = $this->Application->recallObject('addr', 'addr_List', Array ('per_page' => -1, 'skip_counting' => true)); @@ -840,7 +840,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // 1. delete given order item by id @@ -1046,7 +1046,7 @@ $table['p'] = $this->Application->getUnitOption('p', 'TableName'); $table['oi'] = $this->TablePrefix($event).'OrderItems'; - $object =& $event->getObject(); + $object = $event->getObject(); $ord_id = $object->GetID(); // 2.3. check if some amount of same combination & product are not already in shopping cart @@ -1175,7 +1175,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $coupon = $this->Application->recallObject('coup', null, Array ('skip_autoload' => true)); @@ -1240,7 +1240,7 @@ */ function OnRemoveCoupon($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $this->RemoveCoupon($object); @@ -1325,7 +1325,7 @@ function OnCleanupCart($event) { - $object =& $event->getObject(); + $object = $event->getObject(); $sql = 'DELETE FROM '.TABLE_PREFIX.'OrderItems WHERE OrderId = '.$this->getPassedID($event); @@ -1400,7 +1400,7 @@ // if we already know, that there is no such order, // then don't run database query, that will confirm that - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->Clear($id); @@ -1417,7 +1417,7 @@ */ function _createNewCart($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $this->setNextOrderNumber($event); @@ -1511,7 +1511,7 @@ */ function SetStepRequiredFields($event) { - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); @@ -1574,7 +1574,7 @@ return; } - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ $ses_user = $this->Application->RecallVar('user_id'); @@ -1604,7 +1604,7 @@ { parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->setNextOrderNumber($event); @@ -1626,7 +1626,7 @@ { parent::OnBeforeClone($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ if ( substr($event->Special, 0, 9) == 'recurring' ) { @@ -1728,7 +1728,7 @@ $from_tab = substr($event->Name, strlen('OnResetTo')); // load values from db - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // update values from submit @@ -1766,7 +1766,7 @@ function OnMassPlaceOrder($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); $ids = $this->StoreSelectedIDs($event); if($ids) @@ -2242,7 +2242,7 @@ */ function setNextOrderNumber($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $sql = 'SELECT MAX(Number) @@ -2323,7 +2323,7 @@ { parent::OnAfterItemLoad($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // get user fields @@ -2389,7 +2389,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $old_payment_type = $object->GetOriginalField('PaymentType'); @@ -2471,7 +2471,7 @@ */ protected function createAccountFromOrder($event) { - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ $order_helper = $this->Application->recallObject('OrderHelper'); @@ -2509,7 +2509,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $types = $event->getEventParam('types'); @@ -2601,7 +2601,7 @@ function DoPlaceOrder($event) { - $order =& $event->getObject(); + $order = $event->getObject(); $table_prefix = $this->TablePrefix($event); @@ -2617,7 +2617,7 @@ function &queryOrderItems($event, $table_prefix) { - $order =& $event->getObject(); + $order = $event->getObject(); $ord_id = $order->GetId(); // TABLE_PREFIX and $table_prefix are NOT the same !!! @@ -3062,7 +3062,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $shipping_total = $insurance_fee = 0; @@ -3098,7 +3098,7 @@ return ; } - $order =& $event->getObject(); + $order = $event->getObject(); /* @var $order OrdersItem */ if ( !$order->isLoaded() ) { @@ -3193,7 +3193,7 @@ function UpdateShippingOption($event) { - $object =& $event->getObject(); + $object = $event->getObject(); $shipping_option = $object->GetDBField('ShippingOption'); if($shipping_option == '') return; @@ -3224,7 +3224,7 @@ */ function UpdateShippingTypes($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $ord_id = $object->GetID(); @@ -3306,7 +3306,7 @@ function RecalculateTax($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) { @@ -3318,7 +3318,7 @@ function RecalculateProcessingFee($event) { - $object =& $event->getObject(); + $object = $event->getObject(); // Do not reset processing fee while orders are being split (see SplitOrder) if (preg_match("/^-sub/", $object->Special)) return; @@ -3332,15 +3332,15 @@ function UpdateTotals($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $object->UpdateTotals(); } /*function CalculateDiscount($event) { - $object =& $event->getObject(); + $object = $event->getObject(); $coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true)); if(!$coupon->Load( $object->GetDBField('CouponId'), 'CouponId' )) @@ -3425,7 +3425,7 @@ */ function OnResetToPending($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -3455,7 +3455,7 @@ function OnLoadSelected($event) { $event->setPseudoClass('_List'); - $object =& $event->getObject( Array('selected_only' => true) ); + $object = $event->getObject( Array('selected_only' => true) ); $event->redirect = false; } @@ -3807,7 +3807,7 @@ return true; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -3831,7 +3831,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $gift_certificate = $this->Application->recallObject('gc', null, Array ('skip_autoload' => true)); @@ -3872,7 +3872,7 @@ */ function OnRemoveGiftCertificate($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ $this->RemoveGiftCertificate($object); @@ -3888,7 +3888,7 @@ function RecalculateGift($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object OrdersItem */ if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) { @@ -3920,7 +3920,7 @@ ini_set('memory_limit', '300M'); ini_set('max_execution_time', '0'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $file = $object->GetDBField('ShippingTracking') . '.pdf'; @@ -3948,7 +3948,7 @@ $create_account = $this->Application->GetVar('create_account'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $required_fields = Array ('UserPassword', 'UserPassword_plain', 'VerifyUserPassword', 'VerifyUserPassword_plain');