Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r14940 -r15141 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14940) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 15141) @@ -1,6 +1,6 @@ Application->recallObject('orditems'); + $object = $this->Application->recallObject('orditems'); $url_params = Array ( 'p_id' => $object->GetDBField('ProductId'), @@ -91,7 +91,7 @@ function Orderitems_ProductExists($params) { - $object =& $this->Application->recallObject('orditems'); + $object = $this->Application->recallObject('orditems'); return $object->GetDBField('ProductId') > 0; } @@ -134,13 +134,13 @@ function BackOrderFlag($params) { - $object =& $this->Application->recallObject('orditems'); + $object = $this->Application->recallObject('orditems'); return $object->GetDBField('BackOrderFlag'); } function OrderIcon($params) { - $object =& $this->Application->recallObject('orditems'); + $object = $this->Application->recallObject('orditems'); if ($object->GetDBField('BackOrderFlag') == 0) { return $params['ordericon']; } else { @@ -182,7 +182,7 @@ return 0; } - $object =& $this->Application->recallObject('orditems', 'orditems_List'); + $object = $this->Application->recallObject('orditems', 'orditems_List'); /* @var $object kDBList */ $object->Query(); @@ -766,7 +766,7 @@ function OrdersLink(){ $params['pass']='m,ord'; - $main_processor =& $this->Application->RecallObject('m_TagProcessor'); + $main_processor = $this->Application->recallObject('m_TagProcessor'); return $main_processor->Link($params); } @@ -776,7 +776,7 @@ { $object =& $this->getObject($params); - $address_list =& $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); + $address_list = $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); $address_list->Query(); $address_id = $this->Application->GetVar($params['type'].'_address_id'); @@ -817,18 +817,18 @@ } if ( isset($params['user_prefix']) ) { - $user =& $this->Application->recallObject($params['user_prefix']); + $user = $this->Application->recallObject($params['user_prefix']); /* @var $user kDBItem */ } else { - $user =& $this->Application->recallObject('u', null, Array ('skip_autoload' => true)); + $user = $this->Application->recallObject('u', null, Array ('skip_autoload' => true)); /* @var $user kDBItem */ } - $order =& $this->Application->recallObject($this->Prefix . '.last'); + $order = $this->Application->recallObject($this->Prefix . '.last'); /* @var $order OrdersItem */ - $order_helper =& $this->Application->recallObject('OrderHelper'); + $order_helper = $this->Application->recallObject('OrderHelper'); /* @var $order_helper OrderHelper */ $user_fields = $order_helper->getUserFields($order, $params['type'] == 'billing' ? 'Billing' : 'Shipping'); @@ -839,7 +839,7 @@ } } - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates(new kEvent('u:OnBuild'), 'State', 'Country'); @@ -1007,7 +1007,7 @@ */ function PrintOrderInfo($params) { - $order_helper =& $this->Application->recallObject('OrderHelper'); + $order_helper = $this->Application->recallObject('OrderHelper'); /* @var $order_helper OrderHelper */ $object =& $this->getObject($params); @@ -1074,7 +1074,7 @@ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); - $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); + $gateway_object = $this->Application->recallObject( $gw_data['ClassName'] ); /* @var $gateway_object kGWBase */ return $gateway_object->getFormAction($gw_data['gw_params']); @@ -1088,7 +1088,7 @@ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); - $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); + $gateway_object = $this->Application->recallObject( $gw_data['ClassName'] ); /* @var $gateway_object kGWBase */ $tpl = ''."\n"; @@ -1115,7 +1115,7 @@ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); - $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); + $gateway_object = $this->Application->recallObject( $gw_data['ClassName'] ); /* @var $gateway_object kGWBase */ return $gateway_object->NeedPlaceButton($object->GetFieldValues(), $params, $gw_data['gw_params']); @@ -1157,19 +1157,19 @@ { $params['pass'] = 'all,orditems'; $params['m_cat_id'] = 0; - $m_tag_processor =& $this->Application->recallObject('m_TagProcessor'); + $m_tag_processor = $this->Application->recallObject('m_TagProcessor'); return $m_tag_processor->Link($params); } function DiscountField($params) { - $orditems =& $this->Application->recallObject( 'orditems' ); + $orditems = $this->Application->recallObject( 'orditems' ); $item_data = $orditems->GetDBField('ItemData'); if(!$item_data) return ''; $item_data = unserialize($item_data); $discount_prefix = ($item_data['DiscountType'] == 'coupon') ? 'coup' : 'd'; - $discount =& $this->Application->recallObject($discount_prefix, null, Array('skip_autoload' => true)); + $discount = $this->Application->recallObject($discount_prefix, null, Array('skip_autoload' => true)); if(!$discount->isLoaded()) { $discount->Load($item_data['DiscountId']); @@ -1219,15 +1219,15 @@ function OrderProductEmail($params) { - $order =& $this->Application->recallObject('ord'); - $orditems =& $this->Application->recallObject('orditems'); + $order = $this->Application->recallObject('ord'); + $orditems = $this->Application->recallObject('orditems'); $sql = 'SELECT ResourceId FROM '.TABLE_PREFIX.'Products WHERE ProductId = '.$orditems->GetDBField('ProductId'); $resource_id = $this->Conn->GetOne($sql); - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $ml_formatter = $this->Application->recallObject('kMultiLanguage'); $custom_fields = $this->Application->getUnitOption('p', 'CustomFields'); $custom_name = $ml_formatter->LangFieldName('cust_'.array_search($params['msg_custom_field'], $custom_fields)); @@ -1254,13 +1254,13 @@ $to_email = $this->Conn->GetOne($sql); } - $esender =& $application->recallObject('EmailSender.-product'); + $esender = $application->recallObject('EmailSender.-product'); /* @var $esender kEmailSendingHelper */ $esender->SetFrom($from_email, $from_name); $esender->AddTo($to_email, $to_name); - $email_events_eh =& $this->Application->recallObject('emailevents_EventHandler'); + $email_events_eh = $this->Application->recallObject('emailevents_EventHandler'); /* @var $email_events_eh EmailEventsEventsHandler */ list ($message_headers, $message_body) = $email_events_eh->ParseMessageBody($message_template, Array()); @@ -1382,7 +1382,7 @@ return ''; } - $addr_list =& $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); + $addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); $addr_list->Query(); $object =& $this->getObject(); @@ -1416,7 +1416,7 @@ $gw_data = $object->getGatewayData($params['payment_type_id']); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); - $gateway_object =& $this->Application->recallObject( $gw_data['ClassName'] ); + $gateway_object = $this->Application->recallObject( $gw_data['ClassName'] ); $sql = 'SELECT oi.* @@ -1470,11 +1470,11 @@ function AllowAddAddress($params) { - $user =& $this->Application->recallObject('u.current'); + $user = $this->Application->recallObject('u.current'); if ($user->GetDBField('cust_shipping_addr_block')) return false; - $address_list =& $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); + $address_list = $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); $address_list->Query(); $max = $this->Application->ConfigValue('MaxAddresses'); @@ -1526,7 +1526,7 @@ function _formatWeight($weight) { - $regional =& $this->Application->recallObject('lang.current'); + $regional = $this->Application->recallObject('lang.current'); /* @var $regional kDBItem */ switch ( $regional->GetDBField('UnitSystem') ) { @@ -1674,7 +1674,7 @@ */ protected function ContinueShoppingLink($params) { - $order_helper =& $this->Application->recallObject('OrderHelper'); + $order_helper = $this->Application->recallObject('OrderHelper'); /* @var $order_helper OrderHelper */ if ( isset($params['template']) ) {