Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r15141 -r15156 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 15141) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 15156) @@ -1,6 +1,6 @@ getObject($params); + $object = $this->getObject($params); $type = getArrayValue($params,'type'); if($type == 'Company') @@ -160,7 +160,7 @@ 'archived' => ORDER_STATUS_ARCHIVED, ); - $object =& $this->getObject($params); + $object = $this->getObject($params); $status = $object->GetDBField('Status'); $result = true; @@ -175,7 +175,7 @@ function ItemsInCart($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( $object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID ) { @@ -192,7 +192,7 @@ function CartNotEmpty($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID) { return 0; @@ -216,7 +216,7 @@ function CartHasBackorders($params = Array ()) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $sql = 'SELECT COUNT(*) FROM ' . TABLE_PREFIX . 'OrderItems @@ -232,7 +232,7 @@ $o = ''; $limitations_cache = Array (); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $ord_id = $object->GetID(); @@ -425,7 +425,7 @@ */ function AddressValid($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $address_type = isset($params['type']) ? strtolower($params['type']) : 'shipping'; @@ -503,7 +503,7 @@ function PaymentTypeForm($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $payment_type_id = $object->GetDBField('PaymentType'); if($payment_type_id) @@ -523,7 +523,7 @@ */ function UsingCreditCard($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $pt = $object->GetDBField('PaymentType'); @@ -557,7 +557,7 @@ function PrintMonthOptions($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $date = explode('/', $object->GetDBField($params['date_field_name'])); if (!$date || sizeof($date) != 2) { @@ -581,7 +581,7 @@ function PrintYearOptions($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $value = $object->GetDBField( $params['field'] ); $block_params = $this->prepareTagParams($params); @@ -703,7 +703,7 @@ $order_params['name'] = $this->SelectParam($order_params, 'render_as,block'); // $this->Application->SetVar('ord.myorders_id', $this->Application->GetVar('ord_id')); - $object =& $this->getObject($params); + $object = $this->getObject($params); if (!$object->GetDBField('OrderId')) { return; } @@ -774,7 +774,7 @@ function PrintAddresses($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $address_list = $this->Application->recallObject('addr','addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); $address_list->Query(); @@ -847,7 +847,7 @@ function UserLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $user_id = $object->GetDBField( $params['user_field'] ); if ($user_id) { @@ -867,7 +867,7 @@ function UserFound($params) { $virtual_users = Array(USER_ROOT, USER_GUEST, 0); - $object =& $this->getObject($params); + $object = $this->getObject($params); return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users ); } @@ -879,7 +879,7 @@ */ function OrderLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $url_params = Array ( 'm_opener' => 'd', @@ -895,7 +895,7 @@ function HasOriginalAmount($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $original_amount = $object->GetDBField('OriginalAmount'); return $original_amount && ($original_amount != $object->GetDBField('TotalAmount') ); } @@ -910,7 +910,7 @@ */ function OrderHasTangibleItems($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); if ($object->GetID() == FAKE_ORDER_ID) { return false; } @@ -1010,7 +1010,7 @@ $order_helper = $this->Application->recallObject('OrderHelper'); /* @var $order_helper OrderHelper */ - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $currency = isset($params['currency']) ? $params['currency'] : 'selected'; @@ -1068,7 +1068,7 @@ function GetFormAction($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1082,7 +1082,7 @@ function GetFormHiddenFields($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1109,7 +1109,7 @@ function NeedsPlaceButton($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1135,7 +1135,7 @@ function ShippingType($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $shipping_info = unserialize($object->GetDBField('ShippingInfo')); @@ -1179,7 +1179,7 @@ function HasDiscount($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return (float)$object->GetDBField('DiscountTotal') ? 1 : 0; } @@ -1191,7 +1191,7 @@ function HasProductType($params) { $product_types = Array('tangible' => 1, 'subscription' => 2, 'service' => 3, 'downloadable' => 4, 'package' => 5, 'gift' => 6); - $object =& $this->getObject($params); + $object = $this->getObject($params); $sql = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'OrderItems oi @@ -1202,7 +1202,7 @@ function PrintSerializedFields($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'field'); if (!$field) $field = $this->Application->GetVar('field'); $data = unserialize($object->GetDBField($field)); @@ -1286,7 +1286,7 @@ */ protected function PrintTotals($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object OrdersItem */ if ( isset($params['element_order']) ) { @@ -1385,22 +1385,22 @@ $addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); $addr_list->Query(); - $object =& $this->getObject(); + $object = $this->getObject(); if (!$addr_list->CheckAddress($object->GetFieldValues(), $address_type)) { $addr_list->CopyAddress($address_id, $address_type); } } function IsProfileAddress($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $address_type = ucfirst($params['type']); return $object->IsProfileAddress($address_type); } function HasPayPalSubscription($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $sql = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'OrderItems oi @@ -1412,7 +1412,7 @@ function GetPayPalSubscriptionForm($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $gw_data = $object->getGatewayData($params['payment_type_id']); $this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); @@ -1508,7 +1508,7 @@ */ function TotalOrderWeight($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBItem */ $sql = 'SELECT SUM( IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity) ) @@ -1606,7 +1606,7 @@ return ''; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object OrdersItem */ $gw_data = $object->getGatewayData($payment_type_id); @@ -1626,7 +1626,7 @@ */ function USPSLabelFound($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $full_path = USPS_LABEL_FOLDER . $object->GetDBField( $params['field'] ) . '.pdf'; @@ -1697,7 +1697,7 @@ */ protected function AddressesTheSame($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $address_fields = Array ('To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip');