Index: branches/5.2.x/units/gateways/gw_classes/google_checkout.php =================================================================== diff -u -N -r15009 -r15141 --- branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 15009) +++ branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 15141) @@ -1,6 +1,6 @@ Conn->Query($sql); - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $ml_formatter = $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ $cart_xml = Array (); @@ -207,7 +207,7 @@ // parse xml & get order_id from there, like sella pay $this->gwParams = $gw_params; - $xml_helper =& $this->Application->recallObject('kXMLHelper'); + $xml_helper = $this->Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ $root_node =& $xml_helper->Parse( $this->getRequestXML() ); @@ -361,7 +361,7 @@ } // 2. update shipping address in order - $order =& $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); + $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); /* @var $order OrdersItem */ $order->Load($order_id); @@ -372,7 +372,7 @@ 'ShippingZip' => $address_info['POSTAL-CODE'], ); - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ $shipping_address['ShippingCountry'] = $cs_helper->getCountryIso($address_info['COUNTRY-CODE'], true); @@ -481,7 +481,7 @@ } // 2. update shipping address in order - $order =& $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); + $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); /* @var $order OrdersItem */ $order->Load($order_id); @@ -527,7 +527,7 @@ 'POSTAL-CODE' => 'Zip', ); - $cs_helper =& $this->Application->recallObject('CountryStatesHelper'); + $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ foreach ($user_address as $field_prefix => $address_details) { @@ -607,7 +607,7 @@ } // 2. update shipping address in order - $order =& $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); + $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -689,7 +689,7 @@ $this->_chargeOrder($item_data); - $order =& $this->Application->recallObject('ord.-item', null, Array ('skip_autoload' => true)); + $order = $this->Application->recallObject('ord.-item', null, Array ('skip_autoload' => true)); /* @var $order OrdersItem */ $order->Load($item_data['OrderId']); @@ -713,10 +713,10 @@ { $submit_url = $this->gwParams['submit_url'].'/request/Merchant/'.$this->gwParams['merchant_id']; - $curl_helper =& $this->Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ - $xml_helper =& $this->Application->recallObject('kXMLHelper'); + $xml_helper = $this->Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ $curl_helper->SetPostData($command_xml); @@ -773,7 +773,7 @@ } // 2. update shipping address in order - $order =& $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); + $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -800,7 +800,7 @@ if ($order_charged) { // when using Pre-Authorize - $order_eh =& $this->Application->recallObject('ord_EventHandler'); + $order_eh = $this->Application->recallObject('ord_EventHandler'); /* @var $order_eh OrdersEventHandler */ $order_eh->SplitOrder( new kEvent('ord:OnMassOrderApprove'), $order); @@ -846,7 +846,7 @@ $shipping_totals = $this->Conn->GetRow($query); $this->Application->recallObject('ShippingQuoteEngine'); - $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector'); + $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); /* @var $quote_engine_collector ShippingQuoteCollector */ $shipping_quote_params = Array(