Index: branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php (.../affiliate_plans_items_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php (.../affiliate_plans_items_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
GetDBField('ItemType') == 2) {
- $cat_object =& $this->Application->recallObject('c');
+ $cat_object = $this->Application->recallObject('c');
$cat_object->Load( $object->GetDBField('CategoryId') );
- $cat_tag_processor =& $this->Application->recallObject('c_TagProcessor');
+ $cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
return $cat_tag_processor->ItemIcon();
}
Index: branches/5.2.x/units/gateways/gw_classes/multicards.php
===================================================================
diff -u -N -r14569 -r15141
--- branches/5.2.x/units/gateways/gw_classes/multicards.php (.../multicards.php) (revision 14569)
+++ branches/5.2.x/units/gateways/gw_classes/multicards.php (.../multicards.php) (revision 15141)
@@ -1,6 +1,6 @@
parsed_responce = $_POST;
list ($sid, $auth_code) = explode(',', $this->Application->GetVar('user1'));
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
$session->SID = $sid;
$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
$this->Application->SetVar('ord_id', $order_id);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
$order->Load($order_id);
$url = $this->Application->GetVar('user2');
Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
LoadItem($event);
}
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
@@ -288,7 +288,7 @@
}
if ( $object->Load($id) ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetId());
@@ -381,13 +381,13 @@
$inventory_status = $this->Conn->GetOne($sql);
if ( $inventory_status == ProductInventory::BY_OPTIONS ) {
- $live_object =& $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
+ $live_object = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
/* @var $live_object kDBItem */
$live_object->SwitchToLive();
$live_object->Load($id);
- $temp_object =& $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
+ $temp_object = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
/* @var $temp_object kDBItem */
$temp_object->SwitchToTemp();
Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
redirect = false;
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
$brackets_helper->OnMoreBrackets($event);
}
@@ -57,7 +57,7 @@
function OnArrange($event)
{
$event->redirect = false;
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
$brackets_helper->arrangeBrackets($event);
@@ -72,7 +72,7 @@
function OnInfinity($event)
{
$event->redirect = false;
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
$brackets_helper->arrangeBrackets($event);
@@ -100,7 +100,7 @@
$linked_info = $object->getLinkedInfo();
$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
/* @var $brackets_helper kBracketsHelper */
$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array ('Percent' => ''));
@@ -114,7 +114,7 @@
*/
function OnPreSaveBrackets($event)
{
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
/* @var $brackets_helper kBracketsHelper */
$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
Index: branches/5.2.x/units/shipping/shipping_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/shipping/shipping_event_handler.php (.../shipping_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/shipping/shipping_event_handler.php (.../shipping_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
GetDBField('PrecisionAfterSep') . 'f'; // %01.2f
$zero_if_empty = $object->GetDBField('ZeroIfEmpty');
- $sc_object =& $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0));
+ $sc_object = $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0));
/* @var $sc_object kDBItem */
// change default shipping cost values ("Costs" tab on shipping editing) based on field from "Shipping Type"
@@ -78,15 +78,15 @@
*/
function OnApplyModifier($event)
{
- $cost_object =& $this->Application->recallObject('sc');
+ $cost_object = $this->Application->recallObject('sc');
/* @var $cost_object kDBItem */
$object =& $event->getObject();
/* @var $object kDBItem */
$operation = $this->Application->GetVar('operation');
- $formatter =& $this->Application->recallObject('kFormatter');
+ $formatter = $this->Application->recallObject('kFormatter');
/* @var $formatter kFormatter */
$modify_by = $formatter->TypeCast($this->Application->GetVar('modify_by'), array('type'=>'float'));
Index: branches/5.2.x/units/reports/reports_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
GetField($search_field);
if (!$value) return false;
- $lang_current =& $this->Application->recallObject('lang.current');
+ $lang_current = $this->Application->recallObject('lang.current');
$dt_separator = getArrayValue($object->GetFieldOptions($search_field), 'date_time_separator');
if (!$dt_separator) {
$dt_separator = ' ';
@@ -612,7 +612,7 @@
$full_value = $value.$dt_separator.$time;
- $formatter =& $this->Application->recallObject( $object->GetFieldOption($search_field, 'formatter') );
+ $formatter = $this->Application->recallObject( $object->GetFieldOption($search_field, 'formatter') );
$value_ts = $formatter->Parse($full_value, $search_field, $object);
@@ -653,7 +653,7 @@
function OnPieChart($event)
{
- $ChartHelper =& $this->Application->RecallObject('ChartHelper');
+ $ChartHelper = $this->Application->recallObject('ChartHelper');
header("Content-type: image/png");
@@ -691,7 +691,7 @@
function OnPrintChart($event)
{
- $ChartHelper =& $this->Application->RecallObject('ChartHelper');
+ $ChartHelper = $this->Application->recallObject('ChartHelper');
header("Content-type: image/png");
@@ -749,10 +749,10 @@
function OnExportReport($event)
{
- $report =& $this->Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) );
+ $report = $this->Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) );
/* @var $report kDBList*/
- $ReportItem =& $this->Application->recallObject('rep.item', 'rep', Array('skip_autoload' => true));
+ $ReportItem = $this->Application->recallObject('rep.item', 'rep', Array('skip_autoload' => true));
/* @var $ReportItem kDBItem*/
$a_grids = $this->Application->getUnitOption('rep', 'Grids');
Index: branches/5.2.x/units/gateways/gw_classes/rightconnect.php
===================================================================
diff -u -N -r14940 -r15141
--- branches/5.2.x/units/gateways/gw_classes/rightconnect.php (.../rightconnect.php) (revision 14940)
+++ branches/5.2.x/units/gateways/gw_classes/rightconnect.php (.../rightconnect.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->ConfigValue('DefaultEmailSender');
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($post_fields);
Index: branches/5.2.x/units/addresses/addresses_list.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/addresses/addresses_list.php (.../addresses_list.php) (revision 14258)
+++ branches/5.2.x/units/addresses/addresses_list.php (.../addresses_list.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
foreach ($order_fields as $order_field) {
$order->SetDBField($to_address_type.$order_field, $this->GetDBField($order_field) );
}
Index: branches/5.2.x/units/addresses/addresses_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->CheckStateField($event, 'State', 'Country');
@@ -178,7 +178,7 @@
{
parent::OnAfterItemLoad($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -223,7 +223,7 @@
'Country' => 1,
);
- $user =& $this->Application->recallObject($this->Application->isAdmin ? 'u' : 'u.current');
+ $user = $this->Application->recallObject($this->Application->isAdmin ? 'u' : 'u.current');
/* @var $user UsersItem */
$user->setName( $object->GetDBField('To') );
@@ -273,7 +273,7 @@
$load_keys = Array ('PortalUserId' => $user->GetID(), 'IsProfileAddress' => 1);
- $object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$object->Load($load_keys);
@@ -373,7 +373,7 @@
$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->CheckStateField($event, 'State', 'Country');
@@ -416,7 +416,7 @@
{
parent::OnAfterConfigRead($event);
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_tag_processor.php (.../product_option_combinations_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_tag_processor.php (.../product_option_combinations_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
$o = '';
$i = 0;
foreach ($combination as $opt => $val) {
Index: branches/5.2.x/units/reports/reports_tag_processor.php
===================================================================
diff -u -N -r15009 -r15141
--- branches/5.2.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 15009)
+++ branches/5.2.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('rep.params', null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject('rep.params', null, Array('skip_autoload' => true));
/* @var $object kDBItem */
$object->setID(1);
Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php (.../affiliate_plans_brackets_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php (.../affiliate_plans_brackets_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject( $this->getPrefixSpecial() );
+ $br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
/* @var $br_object kDBItem */
$br_data = $this->Application->GetVar( $this->getPrefixSpecial(true) );
@@ -61,7 +61,7 @@
$block_params['name'] = $params['block'];
$first = true;
- $main_object =& $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
+ $main_object = $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
$plan_type = $main_object->GetDBField('PlanType');
$limits_format = ($plan_type == 2) ? '%d' : $br_object->GetFieldOption('FromAmount', 'format');
Index: branches/5.2.x/units/shipping/shipping_tag_processor.php
===================================================================
diff -u -N -r15009 -r15141
--- branches/5.2.x/units/shipping/shipping_tag_processor.php (.../shipping_tag_processor.php) (revision 15009)
+++ branches/5.2.x/units/shipping/shipping_tag_processor.php (.../shipping_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject( $this->getPrefixSpecial() );
+ $object = $this->Application->recallObject( $this->getPrefixSpecial() );
$prec_before_sep = $object->GetDBField('PrecisionBeforeSep');
$prec_after_sep = $object->GetDBField('PrecisionAfterSep');
return $prec_before_sep + $prec_after_sep + 1 + ($prec_before_sep > 3 ? 1:0);
}
function ShowCostsTable($params)
{
- $object =& $this->Application->recallObject( $this->getPrefixSpecial() );
- $zones_object =& $this->Application->recallObject('z');
- $brackets_object =& $this->Application->recallObject('br');
+ $object = $this->Application->recallObject( $this->getPrefixSpecial() );
+ $zones_object = $this->Application->recallObject('z');
+ $brackets_object = $this->Application->recallObject('br');
- $costs_object =& $this->Application->recallObject('sc');
+ $costs_object = $this->Application->recallObject('sc');
/* @var $costs_object kDBItem */
- $main_processor =& $this->Application->recallObject('m_TagProcessor');
+ $main_processor = $this->Application->recallObject('m_TagProcessor');
$zones_sql = 'SELECT * FROM '.$zones_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Name ASC';
$brackets_sql = 'SELECT * FROM '.$brackets_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Start ASC';
@@ -178,7 +178,7 @@
$this->Application->recallObject('ShippingQuoteEngine'); // TODO: why call this here?
- $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector');
+ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
/* @var $quote_engine_collector ShippingQuoteCollector */
$shipping_quote_params = Array (
@@ -220,7 +220,7 @@
$last_shippings = unserialize($last_shippings);
}
- $order_object =& $this->Application->recallObject('ord');
+ $order_object = $this->Application->recallObject('ord');
/* @var $order_object OrdersItem */
$original_shipping = $order_object->GetDBField('ShippingInfo');
@@ -255,7 +255,7 @@
return '';
}
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
foreach ($shipping_types as $shipping_type) {
@@ -285,7 +285,7 @@
function AvailableTypes($params)
{
- $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector');
+ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
/* @var $quote_engine_collector ShippingQuoteCollector */
$types = $quote_engine_collector->GetAvailableShippingTypes();
Index: branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php
===================================================================
diff -u -N -r14689 -r15141
--- branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (.../google_checkout_shippings.php) (revision 14689)
+++ branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (.../google_checkout_shippings.php) (revision 15141)
@@ -1,6 +1,6 @@
Conn->GetOne($sql);
- $order =& $application->recallObject('ord', null, Array ('skip_autoload' => true));
+ $order = $application->recallObject('ord', null, Array ('skip_autoload' => true));
/* @var $order OrdersItem */
$gw_data = $order->getGatewayData($payment_type_id);
$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
- $gateway_object =& $application->recallObject( $gw_data['ClassName'] );
+ $gateway_object = $application->recallObject( $gw_data['ClassName'] );
/* @var $gateway_object kGWGoogleCheckout */
$gateway_object->processNotification($gw_data['gw_params'], 'shippings');
Index: branches/5.2.x/units/gateways/gw_classes/paypal_direct.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/paypal_direct.php (.../paypal_direct.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/paypal_direct.php (.../paypal_direct.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$post_fields['COUNTRYCODE'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -129,7 +129,7 @@
// print_r($post_fields);
// exit;
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($post_fields);
@@ -175,7 +175,7 @@
if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
$curl_helper->SetPostData($post_fields);
$this->gw_responce = $curl_helper->Send($gw_params['submit_url']);
Index: branches/5.2.x/units/gateways/gw_classes/worldpay.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/worldpay.php (.../worldpay.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/worldpay.php (.../worldpay.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -106,7 +106,7 @@
$transaction_status = $this->Application->GetVar('transStatus') == 'Y' ? 1 : 0;
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$url = $this->Application->GetVar($transaction_status ? 'MC_return_page' : 'MC_cancel_return_page');
Index: branches/5.2.x/units/helpers/currency_rates.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/helpers/currency_rates.php (.../currency_rates.php) (revision 14839)
+++ branches/5.2.x/units/helpers/currency_rates.php (.../currency_rates.php) (revision 15141)
@@ -91,7 +91,7 @@
function StoreRates($currencies=null)
{
- $curr_object =& $this->Application->recallObject('curr', null, Array ('skip_autoload' => true));
+ $curr_object = $this->Application->recallObject('curr', null, Array ('skip_autoload' => true));
/* @var $curr_object kDBItem */
if ($currencies) {
Index: branches/5.2.x/units/addresses/addresses_tag_processor.php
===================================================================
diff -u -N -r14957 -r15141
--- branches/5.2.x/units/addresses/addresses_tag_processor.php (.../addresses_tag_processor.php) (revision 14957)
+++ branches/5.2.x/units/addresses/addresses_tag_processor.php (.../addresses_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallTagProcessor('m');
+ $tag_processor = $this->Application->recallTagProcessor('m');
$params['pass'] = 'm,addr';
return $tag_processor->Link($params);
}
Index: branches/5.2.x/units/pricing/pricing_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->GetVar($event->getPrefixSpecial(true));
// $object =& $event->GetObject();
-// $formatter =& $this->Application->recallObject('kFormatter');
+// $formatter = $this->Application->recallObject('kFormatter');
// $temp = $formatter->TypeCastArray($temp, $object);
//uasort($temp, 'pr_bracket_comp');
- $bracket =& $this->Application->recallObject($event->getPrefixSpecial());
+ $bracket = $this->Application->recallObject($event->getPrefixSpecial());
foreach($temp as $id => $record)
{
if( $record['MaxQty'] == '∞' || $record['MaxQty'] == '∞')
Index: branches/5.2.x/units/zones/zones_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/zones/zones_event_handler.php (.../zones_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/zones/zones_event_handler.php (.../zones_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('dst');
+ $dst_object = $this->Application->recallObject('dst');
/* @var $dst_object kDBItem */
if ( $event->Name == 'OnUpdate' ) {
@@ -135,7 +135,7 @@
$object->SetFieldsFromHash($field_values);
$object->SetDBField('ZoneID', $item_id);
- $destination =& $this->Application->recallObject('dst');
+ $destination = $this->Application->recallObject('dst');
switch($event->Name)
{
Index: branches/5.2.x/units/gateways/gw_classes/gw_base.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 14839)
+++ branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CurrencyRates');
+ $converter = $this->Application->recallObject('CurrencyRates');
/* @var $converter CurrencyRates */
$value = $converter->Convert($value, 'PRIMARY', $iso);
@@ -185,7 +185,7 @@
$gw_id = $this->Conn->getInsertID();
// 2. create DISABLED payment type, that uses this gateway (used for storing configuration properties of gateway)
- $payment_type =& $this->Application->recallObject('pt.-item', null, Array ('skip_autoload' => true));
+ $payment_type = $this->Application->recallObject('pt.-item', null, Array ('skip_autoload' => true));
/* @var $payment_type kDBItem */
$payment_type->Clear();
Index: branches/5.2.x/units/pricing/pricing_tag_processor.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/pricing/pricing_tag_processor.php (.../pricing_tag_processor.php) (revision 14839)
+++ branches/5.2.x/units/pricing/pricing_tag_processor.php (.../pricing_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($params['PrefixSpecial']);
+ $object = $this->Application->recallObject($params['PrefixSpecial']);
$price = $object->GetField('Price');
// display selected currency by default
@@ -33,12 +33,12 @@
// convert primary currency to selected (if they are the same, converter will just return)
- $converter =& $this->Application->recallObject('CurrencyRates');
+ $converter = $this->Application->recallObject('CurrencyRates');
/* @var $converter CurrencyRates */
$price = $converter->Convert($price, 'PRIMARY', $iso);
- $currency =& $this->Application->recallObject('curr.-'.$iso, null, Array('skip_autoload' => true));
+ $currency = $this->Application->recallObject('curr.-'.$iso, null, Array('skip_autoload' => true));
if( !$currency->isLoaded() ) $currency->Load($iso, 'ISO');
$symbol = $currency->GetDBField('Symbol');
@@ -94,7 +94,7 @@
usort($brackets, 'pr_bracket_comp');
- $dummy =& $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
+ $dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
/* @var $dummy kDBItem */
foreach($brackets as $id => $values)
Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php (.../shipping_quote_collector.php) (revision 14258)
+++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php (.../shipping_quote_collector.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$has_states = $cs_helper->CountryHasStates( $cs_helper->getCountryIso($params['dest_country'], true) );
@@ -43,7 +43,7 @@
$classes = $this->getEngineClasses();
foreach ($classes as $class) {
- $object =& $this->Application->recallObject($class);
+ $object = $this->Application->recallObject($class);
/* @var $object ShippingQuoteEngine */
$new_shipping_types = $object->GetShippingQuotes($params);
@@ -115,7 +115,7 @@
$classes = $this->getEngineClasses();
foreach ($classes as $class) {
- $object =& $this->Application->recallObject($class);
+ $object = $this->Application->recallObject($class);
/* @var $object ShippingQuoteEngine */
$new_shipping_types = $object->GetAvailableTypes();
@@ -162,7 +162,7 @@
$shipping_id = $shipping_info[$package_num]['ShippingId'];
foreach ($classes as $class) {
- $object =& $this->Application->recallObject($class);
+ $object = $this->Application->recallObject($class);
/* @var $object ShippingQuoteEngine */
$shipping_types = $object->GetAvailableTypes();
Index: branches/5.2.x/units/zones/zones_tag_processor.php
===================================================================
diff -u -N -r14887 -r15141
--- branches/5.2.x/units/zones/zones_tag_processor.php (.../zones_tag_processor.php) (revision 14887)
+++ branches/5.2.x/units/zones/zones_tag_processor.php (.../zones_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$has_states = $cs_helper->getCountriesWithStates();
Index: branches/5.2.x/units/gateways/gw_classes/ideal_nl.php
===================================================================
diff -u -N -r14702 -r15141
--- branches/5.2.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 14702)
+++ branches/5.2.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->StoreVar('gw_success_template',$tag_params['return_template']);
$this->Application->StoreVar('gw_cancel_template',$tag_params['cancel_template']);
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$banks = $curl_helper->Send($gw_params['request_url'].'?a=banklist');
- $parser =& $this->Application->recallObject('kXMLHelper');
+ $parser = $this->Application->recallObject('kXMLHelper');
/* @var $parser kXMLHelper */
$bank_data =& $parser->Parse($banks);
@@ -84,13 +84,13 @@
$fields['returnurl'] = $this->getNotificationUrl() . '?order_id='.$item_data['OrderId'];
$fields['reporturl'] = $this->getNotificationUrl() . '?mode=report&order_id='.$item_data['OrderId'];
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetRequestData($fields);
$transaction_xml = $curl_helper->Send($gw_params['request_url']);
- $parser =& $this->Application->recallObject('kXMLHelper');
+ $parser = $this->Application->recallObject('kXMLHelper');
/* @var $parser kXMLHelper */
$trans_data =& $parser->Parse($transaction_xml);
$transaction_id = $trans_data->FindChildValue('transaction_id');
@@ -131,13 +131,13 @@
$fields['transaction_id'] = $this->Application->GetVar('transaction_id');
$fields['bank_id'] = $this->Application->GetVar('ideal_nl_bank_id');
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetRequestData($fields);
$check_xml = $curl_helper->Send($gw_params['request_url']);
- $parser =& $this->Application->recallObject('kXMLHelper');
+ $parser = $this->Application->recallObject('kXMLHelper');
/* @var $parser kXMLHelper */
$trans_data =& $parser->Parse($check_xml);
@@ -151,7 +151,7 @@
return $result;
}
else {
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
if ($order->GetDBField('Status') == ORDER_STATUS_INCOMPLETE) {
// error
$t = $this->Application->RecallVar('gw_cancel_template');
Index: branches/5.2.x/units/destinations/dst_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
SetDBField('ShippingZoneId', $this->Application->GetVar('z_id'));
}
- $zone_object =& $this->Application->recallObject('z');
+ $zone_object = $this->Application->recallObject('z');
/* @var $zone_object kDBItem */
if ( $zone_object->GetDBField('Type') == 3 ) {
Index: branches/5.2.x/units/coupons/coupons_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
/* @var $temp kTempTablesHandler */
$original_coupon_ids = $this->getSelectedIDs($event, true);
Index: branches/5.2.x/units/helpers/bank_lv_currency_rates.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/helpers/bank_lv_currency_rates.php (.../bank_lv_currency_rates.php) (revision 14839)
+++ branches/5.2.x/units/helpers/bank_lv_currency_rates.php (.../bank_lv_currency_rates.php) (revision 15141)
@@ -26,7 +26,7 @@
{
$xml_parser = xml_parser_create();
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$xml = $curl_helper->Send($this->RateSource);
Index: branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php (.../verisign_pflink.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php (.../verisign_pflink.php) (revision 15141)
@@ -1,6 +1,6 @@
parseGWResponce($_POST);
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
$session->SID = $_POST['USER2'];
$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE OrderId = '.$_POST['USER1']);
$this->Application->SetVar('ord_id', $order_id);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
$order->Load($order_id);
define('ADMIN', 1);
Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php (.../affiliate_payments_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php (.../affiliate_payments_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
getLinkedInfo();
- $parent_object =& $this->Application->recallObject($parent_info['ParentPrefix']);
+ $parent_object = $this->Application->recallObject($parent_info['ParentPrefix']);
/* @var $parent_object kDBItem */
$options = $object->GetFieldOptions('PaymentTypeId');
@@ -61,7 +61,7 @@
{
parent::OnNew($event);
- $affiliate =& $this->Application->recallObject('affil');
+ $affiliate = $this->Application->recallObject('affil');
/* @var $affiliate kDBItem */
$object =& $event->getObject(Array ('skip_autoload' => true));
@@ -92,7 +92,7 @@
WHERE ' . $parent_info['ParentTableKey'] . ' = ' . $parent_info['ParentId'];
$payment_date = $this->Conn->GetOne($sql);
- $affiliate =& $this->Application->recallObject('affil');
+ $affiliate = $this->Application->recallObject('affil');
/* @var $affiliate kDBItem */
$affiliate->SetDBField('AmountToPay', $affiliate->GetDBField('AmountToPay') - $object->GetDBField('Amount'));
Index: branches/5.2.x/units/brackets/brackets_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/brackets/brackets_event_handler.php (.../brackets_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/brackets/brackets_event_handler.php (.../brackets_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
/* @var $shipping_object kDBItem */
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
$fields = Array ('Start', 'End');
- $formatter =& $this->Application->recallObject('kUnitFormatter');
+ $formatter = $this->Application->recallObject('kUnitFormatter');
/* @var $formatter kUnitFormatter */
foreach ($fields as $field) {
@@ -74,10 +74,10 @@
function prepareBrackets($event)
{
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
- $shipping_object =& $this->Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
/* @var $shipping_object kDBItem */
if ( $lang_object->GetDBField('UnitSystem') != 2 || $shipping_object->GetDBField('Type') != 1 ) {
@@ -158,7 +158,7 @@
*/
protected function &getHelper($event, $event_readonly = false)
{
- $shipping_object =& $this->Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
/* @var $shipping_object kDBItem */
$default_start = $shipping_object->GetDBField('Type') == 1 ? 0 : 1;
@@ -168,7 +168,7 @@
$event->redirect = false;
}
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
/* @var $brackets_helper kBracketsHelper */
$brackets_helper->InitHelper('Start', 'End', Array (), $default_start);
@@ -204,10 +204,10 @@
*/
function OnPreSaveBrackets($event)
{
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
- $shipping_object =& $this->Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
/* @var $shipping_object kDBItem */
if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
Index: branches/5.2.x/units/coupon_items/coupon_items_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/coupon_items/coupon_items_event_handler.php (.../coupon_items_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/coupon_items/coupon_items_event_handler.php (.../coupon_items_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('di_EventHandler');
+ $di_handler = $this->Application->recallObject('di_EventHandler');
$di_handler->OnProcessSelected($event);
}
Index: branches/5.2.x/units/order_items/order_items_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('p.-item', null, array('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p.-item', null, array('skip_autoload' => true));
/* @var $product_object ProductsItem */
foreach ($product_ids as $product_id) {
@@ -72,7 +72,7 @@
$this->Application->EventManager->openerStackPush('in-commerce/orders/order_product_edit', $url_params);
}
else {
- $orders_h =& $this->Application->recallObject('ord_EventHandler');
+ $orders_h = $this->Application->recallObject('ord_EventHandler');
/* @var $orders_h OrdersEventHandler */
// 1 for PacakgeNum - temporary solution to overcome splitting into separate sub-orders
@@ -106,7 +106,7 @@
$table_info = $object->getLinkedInfo();
- $main_object =& $this->Application->recallObject($table_info['ParentPrefix']);
+ $main_object = $this->Application->recallObject($table_info['ParentPrefix']);
/* @var $main_object OrdersItem */
foreach ($items_info as $id => $field_values) {
@@ -176,7 +176,7 @@
if ( $changed_fields ) {
$table_info = $object->getLinkedInfo();
- $main_object =& $this->Application->recallObject($table_info['ParentPrefix']);
+ $main_object = $this->Application->recallObject($table_info['ParentPrefix']);
/* @var $main_object OrdersItem */
$oi_string = $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag');
@@ -358,7 +358,7 @@
return true;
}
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
/* @var $order kDBItem */
if ( $order->isLoaded() && ($order->GetID() == $object->GetDBField('OrderId')) ) {
Index: branches/5.2.x/units/payment_type/payment_type_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/payment_type/payment_type_event_handler.php (.../payment_type_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/payment_type/payment_type_event_handler.php (.../payment_type_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Special == 'auto-ord' ) {
- $main_object =& $this->Application->recallObject('ord');
+ $main_object = $this->Application->recallObject('ord');
/* @var $main_object kDBItem */
return $main_object->GetDBField('PaymentType');
@@ -277,7 +277,7 @@
// site domain payment type picker
if ( $event->Special == 'selected' || $event->Special == 'available' ) {
- $edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
+ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
/* @var $edit_picker_helper EditPickerHelper */
$edit_picker_helper->applyFilter($event, 'PaymentTypes');
Index: branches/5.2.x/units/currencies/currencies_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Special == 'selected' || $event->Special == 'available' ) {
- $edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
+ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
/* @var $edit_picker_helper EditPickerHelper */
$edit_picker_helper->applyFilter($event, 'Currencies');
@@ -204,7 +204,7 @@
1 => 'BankLVCurrencyRates'
);
$rates_class = $rate_source_classes[$rate_source];
- $rates =& $this->Application->recallObject($rates_class);
+ $rates = $this->Application->recallObject($rates_class);
$rates->GetRatesData();
@@ -254,7 +254,7 @@
1 => 'BankLVCurrencyRates'
);
$rates_class = $rate_source_classes[$rate_source];
- $rates =& $this->Application->recallObject($rates_class);
+ $rates = $this->Application->recallObject($rates_class);
$rates->GetRatesData();
Index: branches/5.2.x/units/gateways/gw_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/gateways/gw_event_handler.php (.../gw_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/gateways/gw_event_handler.php (.../gw_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->GetVar( $event->getPrefixSpecial(true) );
$PaymentType_info = $this->Application->GetVar( 'pt' );
- $GWConfigValue =& $this->Application->recallObject('gwfv');
+ $GWConfigValue = $this->Application->recallObject('gwfv');
$GWConfigValue->SetDBField('PaymentTypeId', $this->Application->GetVar('pt_id'));
//deleting old values
Index: branches/5.2.x/units/shipping_quote_engines/intershipper.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/shipping_quote_engines/intershipper.php (.../intershipper.php) (revision 14258)
+++ branches/5.2.x/units/shipping_quote_engines/intershipper.php (.../intershipper.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->ConfigValue('Comm_Shipping_Country');
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
if (strlen($params['orig_country']) == 3) {
@@ -253,7 +253,7 @@
xml_set_element_handler( $xml_parser, Array(&$this, 'startElement'), Array(&$this, 'endElement') );
xml_set_character_data_handler( $xml_parser, Array(&$this, 'characterData') );
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($target_url['uri']);
Index: branches/5.2.x/units/helpers/ecb_currency_rates.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/helpers/ecb_currency_rates.php (.../ecb_currency_rates.php) (revision 14839)
+++ branches/5.2.x/units/helpers/ecb_currency_rates.php (.../ecb_currency_rates.php) (revision 15141)
@@ -26,7 +26,7 @@
{
$xml_parser = xml_parser_create();
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$xml = $curl_helper->Send($this->RateSource);
Index: branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php (.../custom_shipping_quote_engine.php) (revision 14258)
+++ branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php (.../custom_shipping_quote_engine.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$user_country_id = $cs_helper->getCountryStateId($user_country, DESTINATION_TYPE_COUNTRY);
Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
getObject();
/* @var $object kDBItem */
- $engine =& $this->Application->recallObject($object->GetDBField('ClassName'));
+ $engine = $this->Application->recallObject($object->GetDBField('ClassName'));
/* @var $engine ShippingQuoteEngine */
$engine_fields = $engine->GetEngineFields();
@@ -49,7 +49,7 @@
$object->SetDBField('Properties', serialize($properties));
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$from_country = $this->Application->ConfigValue('Comm_Shipping_Country');
Index: branches/5.2.x/units/product_options/product_options_tag_processor.php
===================================================================
diff -u -N -r15020 -r15141
--- branches/5.2.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 15020)
+++ branches/5.2.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
getObject($params);
/* @var $object kDBItem */
- $opt_helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
/* @var $opt_helper kProductOptionsHelper */
$parsed = $opt_helper->ExplodeOptionValues($object->GetFieldValues());
@@ -39,7 +39,7 @@
$combination_field = $this->SelectParam($params, 'combination_field');
if ( $mode == 'selected' ) {
- $comb =& $this->Application->recallObject($combination_prefix);
+ $comb = $this->Application->recallObject($combination_prefix);
/* @var $comb kDBItem */
$options = unserialize($comb->GetDBField($combination_field));
@@ -49,7 +49,7 @@
$block_params['selected'] = '';
$block_params['pass_params'] = 1;
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
$o = '';
@@ -148,7 +148,7 @@
$opt_data = $this->Application->GetVar('options');
$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
if (!$options && $this->Application->GetVar('orditems_id')) {
- $ord_item =& $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
+ $ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
/* @var $ord_item kDBItem */
$ord_item->Load($this->Application->GetVar('orditems_id'));
Index: branches/5.2.x/units/gateways/gw_classes/paypal.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/gateways/gw_classes/paypal.php (.../paypal.php) (revision 15134)
+++ branches/5.2.x/units/gateways/gw_classes/paypal.php (.../paypal.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -146,7 +146,7 @@
$ret['state'] = $item_data['BillingState'];
$ret['zip'] = $item_data['BillingZip'];
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -172,7 +172,7 @@
// status, of that PayPal server really has sent such notification to us
$status_map = Array('INVALID' => 0, 'VERIFIED' => 1);
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($_POST);
Index: branches/5.2.x/units/currencies/currencies_tag_processor.php
===================================================================
diff -u -N -r14755 -r15141
--- branches/5.2.x/units/currencies/currencies_tag_processor.php (.../currencies_tag_processor.php) (revision 14755)
+++ branches/5.2.x/units/currencies/currencies_tag_processor.php (.../currencies_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($this->getPrefixSpecial());
+ $object = $this->Application->recallObject($this->getPrefixSpecial());
return $object->GetDBField('ISO') == $this->Application->RecallVar('curr_iso');
}
Index: branches/5.2.x/units/orders/order_calculator.php
===================================================================
diff -u -N -r15009 -r15141
--- branches/5.2.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 15009)
+++ branches/5.2.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
/* @var $opt_helper kProductOptionsHelper */
foreach ($item_data['Options'] as $opt => $val) {
@@ -643,7 +643,7 @@
*/
public function generateOptionsSalt($options)
{
- $opt_helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
/* @var $opt_helper kProductOptionsHelper */
return $opt_helper->OptionsSalt($options, true);
Index: branches/5.2.x/units/brackets/brackets_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/brackets/brackets_tag_processor.php (.../brackets_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/brackets/brackets_tag_processor.php (.../brackets_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
$default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1;
- $brackets_helper =& $this->Application->recallObject('BracketsHelper');
+ $brackets_helper = $this->Application->recallObject('BracketsHelper');
/* @var $brackets_helper kBracketsHelper */
$brackets_helper->InitHelper('Start', 'End', Array(), $default_start );
- $br_object =& $this->Application->recallObject( $this->getPrefixSpecial() );
+ $br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
$event = new kEvent($this->getPrefixSpecial(true) . ':OnArrange');
$br_data = $brackets_helper->getBrackets($event);
@@ -48,7 +48,7 @@
usort($brackets, Array(&$brackets_helper, 'compareBrackets'));
- $dummy =& $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
+ $dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
/* @var $dummy kDBItem */
// performs number formatting
@@ -75,7 +75,7 @@
$block_params['name'] = $params['block'];
$first = true;
- $main_object =& $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
+ $main_object = $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
// $plan_type = $main_object->GetDBField('PlanType');
// $limits_format = ($plan_type == 2) ? '%d' : $br_object->getFieldOption('Start', 'format');
@@ -101,7 +101,7 @@
$block_params['max'] = ($values['End'] == -1) ? '∞' : $values['End'];
$block_params['next_min_id'] = $next_bracket[$br_object->IDField];
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
if($lang_object->GetDBField('UnitSystem') == 2 && $main_object->GetDBField('Type') == 1)
{
if($block_params['min'] === '')
@@ -144,7 +144,7 @@
/*
function ShowBracketsForm($params)
{
- $br_object =& $this->Application->recallObject( $this->getPrefixSpecial() );
+ $br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
$br_data = $this->Application->GetVar('br');
Index: branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php (.../coupon_items_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php (.../coupon_items_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
GetDBField('ItemType') == 2) {
- $cat_object =& $this->Application->recallObject('c');
+ $cat_object = $this->Application->recallObject('c');
$cat_object->Load( $object->GetDBField('CategoryId') );
- $cat_tag_processor =& $this->Application->recallObject('c_TagProcessor');
+ $cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
return $cat_tag_processor->ItemIcon();
}
Index: branches/5.2.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r15097 -r15141
--- branches/5.2.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 15097)
+++ branches/5.2.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
/* @var $order kDBList */
if ( $order->GetDBField('Status') != ORDER_STATUS_INCOMPLETE ) {
@@ -71,7 +71,7 @@
$render_as = $this->SelectParam($params, 'render_as');
$block_params['name'] = $render_as;
- $opt_helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
/* @var $opt_helper kProductOptionsHelper */
$o = '';
@@ -99,7 +99,7 @@
$val = join(',', $val);
}*/
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
if ( $render_as ) {
@@ -219,7 +219,7 @@
$block_params['name'] = $this->SelectParam($params, 'render_as,block');
$block_params['pass_params'] = 'true';
- $product_object =& $this->Application->recallObject('p', 'p', Array ('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p', 'p', Array ('skip_autoload' => true));
/* @var $product_object kCatDBItem */
$i = 0;
@@ -267,7 +267,7 @@
}
$options = getArrayValue($item_data, 'Options');
- $helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $helper = $this->Application->recallObject('kProductOptionsHelper');
/* @var $helper kProductOptionsHelper */
$crc = $helper->OptionsSalt($options, true);
@@ -292,7 +292,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $order_helper =& $this->Application->recallObject('OrderHelper');
+ $order_helper = $this->Application->recallObject('OrderHelper');
/* @var $order_helper OrderHelper */
return $order_helper->eligibleForFreePromoShipping($object);
Index: branches/5.2.x/units/gateways/gw_tag_processor.php
===================================================================
diff -u -N -r14957 -r15141
--- branches/5.2.x/units/gateways/gw_tag_processor.php (.../gw_tag_processor.php) (revision 14957)
+++ branches/5.2.x/units/gateways/gw_tag_processor.php (.../gw_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->GetVar('pt_id');
- $GWConfigValue =& $this->Application->recallObject('gwfv');
+ $GWConfigValue = $this->Application->recallObject('gwfv');
$sql = 'SELECT Value, GWConfigFieldId FROM '.$GWConfigValue->TableName.' WHERE PaymentTypeId = '.$payment_type_id;
$this->ConfigValues = $this->Conn->GetCol($sql,'GWConfigFieldId');
@@ -62,7 +62,7 @@
function PrintList($params)
{
- $list =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List', $params);
+ $list = $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List', $params);
$id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
$list->Query();
@@ -72,7 +72,7 @@
$block_params['name']=$params['block'];
$block_params['pass_params']='true';
- $payment_type_object =& $this->Application->recallObject('pt');
+ $payment_type_object = $this->Application->recallObject('pt');
$o = '';
Index: branches/5.2.x/units/helpers/frny_currency_rates.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/helpers/frny_currency_rates.php (.../frny_currency_rates.php) (revision 14839)
+++ branches/5.2.x/units/helpers/frny_currency_rates.php (.../frny_currency_rates.php) (revision 15141)
@@ -24,7 +24,7 @@
function GetRatesData()
{
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
for($i = 0; $i < 10; $i++)
Index: branches/5.2.x/units/taxes/taxes_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/taxes/taxes_event_handler.php (.../taxes_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/taxes/taxes_event_handler.php (.../taxes_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('taxdst');
+ $dst_object = $this->Application->recallObject('taxdst');
/* @var $dst_object kDBItem */
if ( $event->Name == 'OnUpdate' ) {
@@ -128,8 +128,8 @@
$object->SetFieldsFromHash($field_values);
$object->SetDBField('TaxZoneID', $item_id);
- $destination =& $this->Application->recallObject('taxdst');
- $tax_object =& $this->Application->recallObject('tax');
+ $destination = $this->Application->recallObject('taxdst');
+ $tax_object = $this->Application->recallObject('tax');
switch($event->Name)
{
Index: branches/5.2.x/units/taxes/taxes_tag_processor.php
===================================================================
diff -u -N -r14887 -r15141
--- branches/5.2.x/units/taxes/taxes_tag_processor.php (.../taxes_tag_processor.php) (revision 14887)
+++ branches/5.2.x/units/taxes/taxes_tag_processor.php (.../taxes_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$has_states = $cs_helper->getCountriesWithStates();
Index: branches/5.2.x/units/product_option_combinations/product_option_formatters.php
===================================================================
diff -u -N -r14625 -r15141
--- branches/5.2.x/units/product_option_combinations/product_option_formatters.php (.../product_option_formatters.php) (revision 14625)
+++ branches/5.2.x/units/product_option_combinations/product_option_formatters.php (.../product_option_formatters.php) (revision 15141)
@@ -1,6 +1,6 @@
GetFieldOptions($field_name);
if ( isset($format) ) $options['format'] = $format;
$data = unserialize($value);
- $opt_helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
$top_prefix = $this->Application->GetTopmostPrefix($object->Prefix);
$use_temp = substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't';
@@ -92,12 +92,12 @@
$converted = array_key_exists('converted', $options) ? $options['converted'] : false;
if ($converted) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
return $lang->formatNumber($object->GetDBField($field_name), 2);
}
$data = unserialize($object->GetDBField('Combination'));
- $opt_helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $opt_helper = $this->Application->recallObject('kProductOptionsHelper');
$price = $object->GetDBField('BasePrice');
$addition = 0;
Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r14582 -r15141
--- branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 14582)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
/* @var $xml_helper kXMLHelper */
$root_node =& $xml_helper->Parse($body);
@@ -956,7 +956,7 @@
}
// parse response
- $xml_helper =& $this->Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
$root_node =& $xml_helper->Parse($body);
/* @var $root_node kXMLNode */
$Postage = 0;
@@ -1000,7 +1000,7 @@
}
if ( $label_file != '' ) {
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->CheckFolder(USPS_LABEL_FOLDER);
@@ -1014,7 +1014,7 @@
function GetUSPSCountry($country, $default = 'US')
{
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$country = $cs_helper->getCountryIso($country);
@@ -1099,7 +1099,7 @@
return Array('error' => implode('
', $errors));
}
- $xml_helper =& $this->Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
$root_node =& $xml_helper->Parse($body);
/* @var $root_node kXMLNode */
Index: branches/5.2.x/units/product_option_combinations/products_option_combination_item.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/product_option_combinations/products_option_combination_item.php (.../products_option_combination_item.php) (revision 14258)
+++ branches/5.2.x/units/product_option_combinations/products_option_combination_item.php (.../products_option_combination_item.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('p');
+ $product = $this->Application->recallObject('p');
switch($this->GetDBField('PriceType'))
{
Index: branches/5.2.x/units/payment_type_currencies/payment_type_currencies_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/payment_type_currencies/payment_type_currencies_tag_processor.php (.../payment_type_currencies_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/payment_type_currencies/payment_type_currencies_tag_processor.php (.../payment_type_currencies_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($this->Prefix);
- $payment_type_object =& $this->Application->recallObject('pt');
- $currency_object =& $this->Application->recallObject('curr.active');
+ $object = $this->Application->recallObject($this->Prefix);
+ $payment_type_object = $this->Application->recallObject('pt');
+ $currency_object = $this->Application->recallObject('curr.active');
$pt_id = $payment_type_object->GetDBField('PaymentTypeId');
$curr_id = $currency_object->GetDBField('CurrencyId');
Index: branches/5.2.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
GetDBField('InventoryStatus') == 2) {
// save inventory changes to option combination instead of product
- $object =& $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
$object->Load($combination_id);
}
elseif ($combination_id > 0) {
@@ -217,7 +217,7 @@
function RealInventoryAction($action, $prod_id, $qty, $combination_id)
{
- $product =& $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
+ $product = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
$product->SwitchToLive();
$product->Load($prod_id);
@@ -240,7 +240,7 @@
$products = array_unique($products);
if ($products) {
- $product_obj =& $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
+ $product_obj = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
$product_obj->SwitchToLive();
foreach ($products as $product_key) {
list($prod_id, $combination_id) = explode('_', $product_key);
@@ -291,7 +291,7 @@
if (!$orders) return;
- $order =& $this->Application->recallObject('ord.-inv', null, Array('skip_autoload' => true));
+ $order = $this->Application->recallObject('ord.-inv', null, Array('skip_autoload' => true));
foreach ($orders as $ord_id) {
$order->Load($ord_id);
@@ -319,7 +319,7 @@
{
parent::OnBeforeDeleteFromLive($event);
- $product =& $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
+ $product = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
/* @var $product kCatDBItem */
$product->SwitchToLive();
@@ -330,7 +330,7 @@
return ;
}
- $temp =& $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
+ $temp = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
/* @var $temp kCatDBItem */
$temp->SwitchToTemp();
@@ -639,7 +639,7 @@
$object->removeFilter('category_filter');
$object->AddGroupByField('%1$s.ProductId');
- $object_product =& $this->Application->recallObject($event->Prefix);
+ $object_product = $this->Application->recallObject($event->Prefix);
/* @var $object_product ProductsItem */
$content_ids_array = $object_product->GetPackageContentIds();
@@ -753,7 +753,7 @@
function OnRecommendProduct($event)
{
// used for error reporting only -> rewrite code + theme (by Alex)
- $object =& $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too
+ $object = $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too
/* @var $object kDBItem */
$friend_email = $this->Application->GetVar('friend_email');
@@ -800,7 +800,7 @@
function OnSaveVirtualProduct($event)
{
$object =& $event->getObject( Array('skip_autoload' => true) );
- $listing_type =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
+ $listing_type = $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
$listing_type->Load($event->MasterEvent->getEventParam('id'));
$product_id = $listing_type->GetDBField('VirtualProductId');
@@ -812,7 +812,7 @@
if (!$listing_type->GetDBField('EnableBuying')) {
if ($product_id) {
// delete virtual product here
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
$temp_handler->DeleteItems($event->Prefix, $event->Special, Array($product_id));
$listing_type->SetDBField('VirtualProductId', 0);
@@ -821,7 +821,7 @@
return true;
}
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
$object->SetDBField($ml_formatter->LangFieldName('Name'), $listing_type->GetDBField('ShopCartName') );
$object->SetDBField($ml_formatter->LangFieldName('Description'), $listing_type->GetDBField('Description'));
$object->SetDBField('SKU', 'ENHANCE_LINK_'.abs( crc32( $listing_type->GetDBField('Name') ) ) );
@@ -869,7 +869,7 @@
$product_id = $listing_type->GetDBField('VirtualProductId');
if ( $product_id ) {
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($product_id));
}
}
@@ -925,7 +925,7 @@
$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations', 'REPLACE');
- $sub_order =& $this->Application->recallObject('ord.-sub'.$event->getEventParam('next_sub_number'), 'ord');
+ $sub_order = $this->Application->recallObject('ord.-sub'.$event->getEventParam('next_sub_number'), 'ord');
$sub_order->SetDBField('IsRecurringBilling', getArrayValue($item_data, 'IsRecurringBilling') ? 1 : 0);
$sub_order->SetDBField('GroupId', $group_id);
$sub_order->SetDBField('NextCharge_date', $expire);
@@ -1046,7 +1046,7 @@
{
$object =& $event->getObject();
if ($object->GetDBField('ProductId') == '') return ; // if product does not have ID - it's not yet created
- $opt_object =& $this->Application->recallObject('po', null, Array('skip_autoload' => true) );
+ $opt_object = $this->Application->recallObject('po', null, Array('skip_autoload' => true) );
$has_required = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$opt_object->TableName.' WHERE Required = 1 AND ProductId = '.$object->GetDBField('ProductId'));
//we need to imitate data sumbit, as parent' PreSave sets object values from $items_info
$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
@@ -1065,7 +1065,7 @@
*/
function setPrimaryPrice($product_id, $price, $additional_fields = Array())
{
- $pr_object =& $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) );
+ $pr_object = $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) );
/* @var $pr_object kDBItem */
$pr_object->Load( Array('ProductId' => $product_id, 'IsPrimary' => 1) );
@@ -1409,7 +1409,7 @@
if ( $this->Application->isAdminUser ) {
// we may get product id out of OrderItem, if it exists
- $ord_item =& $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0));
+ $ord_item = $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0));
/* @var $ord_item OrdersItem */
if ( $ord_item->GetDBField('ProductId') ) {
Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
@@ -186,7 +186,7 @@
if ( $object->isLoaded() && ($object->GetDBField('Status') == 1) ) {
// user is found with such email
- $affiliate_user =& $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true));
+ $affiliate_user = $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true));
/* @var $affiliate_user UsersItem */
$affiliate_user->Load($object->GetDBField('PortalUserId'));
@@ -225,7 +225,7 @@
*/
function OnOrderApprove($event)
{
- $order =& $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
+ $order = $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
/* @var $order OrdersItem */
$affiliate_id = $order->GetDBField('AffiliateId');
@@ -237,7 +237,7 @@
/* @var $object kDBItem */
if ( $object->Load($affiliate_id) ) {
- $affiliate_plan =& $this->Application->recallObject('ap', null, Array ('skip_autoload' => true));
+ $affiliate_plan = $this->Application->recallObject('ap', null, Array ('skip_autoload' => true));
/* @var $affiliate_plan kDBItem */
$affiliate_plan->Load($object->GetDBField('AffiliatePlanId'));
@@ -428,7 +428,7 @@
{
parent::OnBeforeDeleteFromLive($event);
- $payment_object =& $this->Application->recallObject('apayments', 'apayments', Array ('skip_autoload' => true));
+ $payment_object = $this->Application->recallObject('apayments', 'apayments', Array ('skip_autoload' => true));
/* @var $payment_object kDBItem */
$id = $event->getEventParam('id');
Index: branches/5.2.x/gw_notify.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/gw_notify.php (.../gw_notify.php) (revision 15134)
+++ branches/5.2.x/gw_notify.php (.../gw_notify.php) (revision 15141)
@@ -1,6 +1,6 @@
GetADODBConnection();
$application->setUnitOption('ord','AutoLoad',false);
- $order =& $application->recallObject('ord');
+ $order = $application->recallObject('ord');
$order_id = $application->GetVar('order_id');
if ($order_id) {
@@ -39,7 +39,7 @@
$gw_data = $order->getGatewayData($application->GetVar('payment_type_id'));
$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
- $gateway_object =& $application->recallObject( $gw_data['ClassName'] );
+ $gateway_object = $application->recallObject( $gw_data['ClassName'] );
$transaction_status = $gateway_object->processNotification($gw_data['gw_params']);
Index: branches/5.2.x/units/manufacturers/manufacturers_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/manufacturers/manufacturers_event_handler.php (.../manufacturers_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/manufacturers/manufacturers_event_handler.php (.../manufacturers_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -110,7 +110,7 @@
{
parent::OnBeforeItemUpdate($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->CheckStateField($event, 'State', 'Country');
@@ -128,7 +128,7 @@
{
parent::OnBeforeItemCreate($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->CheckStateField($event, 'State', 'Country');
Index: branches/5.2.x/units/gateways/gw_classes/authorizenet.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/authorizenet.php (.../authorizenet.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/authorizenet.php (.../authorizenet.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$post_fields['x_country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -63,7 +63,7 @@
$post_fields['x_description'] = 'Invoice #'.$item_data['OrderNumber'];
$post_fields['x_email_customer'] = 'FALSE';
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($post_fields);
@@ -104,7 +104,7 @@
if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True';
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetPostData($post_fields);
Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php
===================================================================
diff -u -N -r14677 -r15141
--- branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 14677)
+++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject($this->Prefix . '.user');
+ $object = $this->Application->recallObject($this->Prefix . '.user');
/* @var $object kDBItem */
return $object->isLoaded();
@@ -92,7 +92,7 @@
*/
protected function User_AffiliateIsActive($params)
{
- $object =& $this->Application->recallObject($this->Prefix . '.user');
+ $object = $this->Application->recallObject($this->Prefix . '.user');
/* @var $object kDBItem */
return $object->isLoaded() && ($object->GetDBField('Status') == STATUS_ACTIVE);
@@ -133,7 +133,7 @@
function IsAffiliateOrRegisterAsAffiliateAllowed($params)
{
- $object =& $this->Application->recallObject($this->Prefix . '.user');
+ $object = $this->Application->recallObject($this->Prefix . '.user');
/* @var $object kDBItem */
return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') || $object->isLoaded() ? 1 : 0;
Index: branches/5.2.x/units/discount_items/discount_items_tag_processor.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/discount_items/discount_items_tag_processor.php (.../discount_items_tag_processor.php) (revision 14258)
+++ branches/5.2.x/units/discount_items/discount_items_tag_processor.php (.../discount_items_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
GetDBField('ItemType') == 2) {
- $cat_object =& $this->Application->recallObject('c');
+ $cat_object = $this->Application->recallObject('c');
$cat_object->Load( $object->GetDBField('CategoryId') );
- $cat_tag_processor =& $this->Application->recallObject('c_TagProcessor');
+ $cat_tag_processor = $this->Application->recallObject('c_TagProcessor');
return $cat_tag_processor->ItemIcon();
}
Index: branches/5.2.x/units/products/products_tag_processor.php
===================================================================
diff -u -N -r15053 -r15141
--- branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 15053)
+++ branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->ConfigValue('Comm_Perpage_Products_Short');
}
- $object =& $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
+ $object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
switch($params['ListType'])
{
@@ -281,7 +281,7 @@
if ($object->GetDBField('HasRequiredOptions')) {
$t = $params['product_template'];
if (!$t) {
- $theme =& $this->Application->recallObject('theme.current');
+ $theme = $this->Application->recallObject('theme.current');
if ($theme->GetDBField('Name') == 'onlinestore') {
$t = 'in-commerce/product/details';
}
@@ -331,10 +331,10 @@
}
$params['p_id'] = $product_id;
- $product =& $this->Application->recallObject($this->getPrefixSpecial());
+ $product = $this->Application->recallObject($this->getPrefixSpecial());
$params['m_cat_id'] = $product->GetDBField('CategoryId');
- $main_processor =& $this->Application->recallObject('m_TagProcessor');
+ $main_processor = $this->Application->recallObject('m_TagProcessor');
return $main_processor->T($params);
}
@@ -425,13 +425,13 @@
function ListReviews($params)
{
- $review_tag_processor =& $this->Application->recallObject('rev.product_TagProcessor');
+ $review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
return $review_tag_processor->PrintList($params);
}
function ReviewCount($params)
{
- $review_tag_processor =& $this->Application->recallObject('rev.product_TagProcessor');
+ $review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
return $review_tag_processor->TotalRecords($params);
}
@@ -475,7 +475,7 @@
function AlreadyReviewed($params)
{
- $rev_tag_processor =& $this->Application->recallObject('rev_TagProcessor');
+ $rev_tag_processor = $this->Application->recallObject('rev_TagProcessor');
return $rev_tag_processor->AlreadyReviewed($params);
}
@@ -555,7 +555,7 @@
function UniqueFileName($params)
{
- $file_object =& $this->Application->recallObject('file.downl');
+ $file_object = $this->Application->recallObject('file.downl');
return ($file_object->GetDBField('Name') &&
$file_object->GetDBField('Name') != $file_object->GetDBField('FilePath'))
? 1 : 0;
@@ -574,7 +574,7 @@
if (!$download_helper_class) {
$download_helper_class = 'DownloadHelper';
}
- $download_helper =& $this->Application->recallObject($download_helper_class);
+ $download_helper = $this->Application->recallObject($download_helper_class);
if (!$download_helper->CheckAccess($file_id, $product_id)) {
$this->Application->ApplicationDie('File Access permission check failed!');
}
@@ -647,7 +647,7 @@
function ListShippingTypes($params)
{
- $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector');
+ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
/* @var $quote_engine_collector ShippingQuoteCollector */
$types = $quote_engine_collector->GetAvailableShippingTypes();
@@ -706,7 +706,7 @@
}
if (isset($params['currency'])) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
$iso = $this->GetISO($params['currency']);
Index: branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php
===================================================================
diff -u -N -r14594 -r15141
--- branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php (.../affiliate_payment_types_tp.php) (revision 14594)
+++ branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php (.../affiliate_payment_types_tp.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject( $params['prefix'] );
+ $affiliate = $this->Application->recallObject( $params['prefix'] );
/* @var $affiliate kDBItem */
$payment_type = $affiliate->GetDBField( $params['field'] );
Index: branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (.../google_checkout_notify.php) (revision 15134)
+++ branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (.../google_checkout_notify.php) (revision 15141)
@@ -1,6 +1,6 @@
SetVar('payment_type_id', $payment_type_id); // keep, because kGWGoogleCheckout::processNewOrderNotification relies on this
- $order =& $application->recallObject('ord', null, Array ('skip_autoload' => true));
+ $order = $application->recallObject('ord', null, Array ('skip_autoload' => true));
/* @var $order OrdersItem */
$gw_data = $order->getGatewayData($application->GetVar('payment_type_id'));
$application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
- $gateway_object =& $application->recallObject( $gw_data['ClassName'] );
+ $gateway_object = $application->recallObject( $gw_data['ClassName'] );
$transaction_status = $gateway_object->processNotification($gw_data['gw_params']);
Index: branches/5.2.x/units/downloads/download_helper.php
===================================================================
diff -u -N -r14723 -r15141
--- branches/5.2.x/units/downloads/download_helper.php (.../download_helper.php) (revision 14723)
+++ branches/5.2.x/units/downloads/download_helper.php (.../download_helper.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('file', null, Array('skip_autoload' => true));
+ $file_object = $this->Application->recallObject('file', null, Array('skip_autoload' => true));
/* @var $file_object kDBItem */
$sql = $file_id ?
@@ -57,9 +57,9 @@
function LogDownload($product_id, $file_info)
{
- $down_object =& $this->Application->recallObject('down', null, Array('skip_autoload' => true));
- $user_object =& $this->Application->recallObject('u.current');
- $product_object =& $this->Application->recallObject( 'p' );
+ $down_object = $this->Application->recallObject('down', null, Array('skip_autoload' => true));
+ $user_object = $this->Application->recallObject('u.current');
+ $product_object = $this->Application->recallObject( 'p' );
$down_object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
$down_object->SetDBField('Username', $user_object->GetDBField('Username'));
Index: branches/5.2.x/units/gift_certificates/gift_certificates_tp.php
===================================================================
diff -u -N -r14569 -r15141
--- branches/5.2.x/units/gift_certificates/gift_certificates_tp.php (.../gift_certificates_tp.php) (revision 14569)
+++ branches/5.2.x/units/gift_certificates/gift_certificates_tp.php (.../gift_certificates_tp.php) (revision 15141)
@@ -1,6 +1,6 @@
IsNewItem($params)) {
@@ -39,7 +39,7 @@
$params[$this->getPrefixSpecial().'_id'] = $this->Application->RecallVar('print_certificate_id');
$this->Application->RemoveVar('print_certificate_id');
- $main_processor =& $this->Application->recallTagProcessor('m');
+ $main_processor = $this->Application->recallTagProcessor('m');
/* @var $main_processor kMainTagProcessor */
return $main_processor->Link($params);
Index: branches/5.2.x/units/orders/order_validator.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/orders/order_validator.php (.../order_validator.php) (revision 15134)
+++ branches/5.2.x/units/orders/order_validator.php (.../order_validator.php) (revision 15141)
@@ -1,6 +1,6 @@
dataSource->getGatewayData();
$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'] );
$test_numbers = $gateway_object->GetTestCCNumbers();
Index: branches/5.2.x/units/gateways/gw_classes/paybox.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 15141)
@@ -1,6 +1,6 @@
parsed_responce = $result;
list ($sid, $auth_code) = explode(',', $result['reference']);
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
$session->SID = $sid;
$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
$this->Application->SetVar('ord_id', $order_id);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
$order->Load($order_id);
return $result['error'] === '00000' ? 1 : 0;
Index: branches/5.2.x/units/orders/orders_item.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 15134)
+++ branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$shipping_country_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingCountry'), DESTINATION_TYPE_COUNTRY);
@@ -286,7 +286,7 @@
return;
}
- $gc =& $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
+ $gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
/* @var $gc kDBItem */
$gc->Load($gc_id);
@@ -327,7 +327,7 @@
{
$gc_id = $this->GetDBField('GiftCertificateId');
- $gc =& $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
+ $gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true));
/* @var $gc kDBItem */
$gc->Load($gc_id);
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(
Index: branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->GetVar($event->getPrefixSpecial(true));
- $tax_object =& $this->Application->recallObject('tax');
+ $tax_object = $this->Application->recallObject('tax');
/* @var $tax_object kDBItem */
$std_dest_id = $this->Application->GetVar('StatesCountry');
if ( $items_info ) {
- $taxdest =& $this->Application->recallObject($event->getPrefixSpecial(true), null);
+ $taxdest = $this->Application->recallObject($event->getPrefixSpecial(true), null);
/* @var $taxdest kDBItem */
$parent_info =& $object->GetLinkedInfo();
@@ -118,7 +118,7 @@
$object->SetDBField('TaxZoneId', $this->Application->GetVar('tax_id'));
}
- $tax_object =& $this->Application->recallObject('tax');
+ $tax_object = $this->Application->recallObject('tax');
/* @var $tax_object kDBItem */
if ( $tax_object->GetDBField('Type') == 3 ) {
Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
getObject(Array ('skip_autoload' => true));
/* @var $object kDBItem */
- $zones_object =& $this->Application->recallObject('z');
+ $zones_object = $this->Application->recallObject('z');
$sql = 'SELECT ZoneID
FROM ' . $zones_object->TableName . '
@@ -93,7 +93,7 @@
$object =& $event->getObject();
- $shipping_object =& $this->Application->recallObject('s');
+ $shipping_object = $this->Application->recallObject('s');
if( $this->Application->GetVar('br_propagate_id') )
{
@@ -173,7 +173,7 @@
$object =& $event->getObject(Array ('skip_autoload' => true));
/* @var $object kDBItem */
- $zones_object =& $this->Application->recallObject('z');
+ $zones_object = $this->Application->recallObject('z');
/* @var $zones_object kDBItem */
$sql = 'SELECT ZoneID
@@ -200,7 +200,7 @@
protected function customProcessing(kEvent $event, $type)
{
if ( $type == 'before' && $this->Application->GetVar('sc') ) {
- $shipping_obj =& $this->Application->recallObject('s');
+ $shipping_obj = $this->Application->recallObject('s');
/* @var $shipping_obj kDBItem */
$object =& $event->getObject();
@@ -245,16 +245,16 @@
$id = $event->getEventParam('id');
- $object =& $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
+ $object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
/* @var $object kDBItem */
$object->SwitchToTemp();
$object->Load($id);
- $shipping_obj =& $this->Application->recallObject('s');
+ $shipping_obj = $this->Application->recallObject('s');
/* @var $shipping_obj kDBItem */
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
@@ -278,16 +278,16 @@
$id = $event->getEventParam('id');
- $object =& $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
+ $object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
/* @var $object kDBItem */
$object->SwitchToTemp();
$object->Load($id);
- $shipping_obj =& $this->Application->recallObject('s');
+ $shipping_obj = $this->Application->recallObject('s');
/* @var $shipping_obj kDBItem */
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->RecallVar($event->getPrefixSpecial(true) . '_id');
- $order_dummy =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $order_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $order_dummy OrdersItem */
foreach ($items_info as $id => $field_values) {
@@ -204,13 +204,13 @@
$billing_address_id = $this->Application->GetVar('billing_address_id');
if ($shipping_address_id || $billing_address_id) {
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
- $address =& $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true));
+ $address = $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true));
/* @var $address AddressesItem */
- $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) );
/* @var $addr_list AddressesList */
$addr_list->Query();
@@ -303,7 +303,7 @@
*/
function updateUserID($order_id, $event)
{
- $user =& $this->Application->recallObject('u.current');
+ $user = $this->Application->recallObject('u.current');
/* @var $user UsersItem */
$affiliate_id = $this->isAffiliate( $user->GetID() );
@@ -331,7 +331,7 @@
function isAffiliate($user_id)
{
- $affiliate_user =& $this->Application->recallObject('affil.-item', null, Array('skip_autoload' => true) );
+ $affiliate_user = $this->Application->recallObject('affil.-item', null, Array('skip_autoload' => true) );
/* @var $affiliate_user kDBItem */
$affiliate_user->Load($user_id, 'PortalUserId');
@@ -350,7 +350,7 @@
$gw_data = $order->getGatewayData();
$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 */
$payment_result = $gateway_object->DirectPayment($order->GetFieldValues(), $gw_data['gw_params']);
@@ -382,23 +382,23 @@
function PrepareCoupons($event, &$order)
{
- $order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
/* @var $order_items kDBList */
$order_items->linkToParent($order->Special);
$order_items->Query();
$order_items->GoFirst();
$assigned_coupons = array();
- $coup_handler =& $this->Application->recallObject('coup_EventHandler');
+ $coup_handler = $this->Application->recallObject('coup_EventHandler');
foreach($order_items->Records as $product_item)
{
if ($product_item['ItemData']) {
$item_data = unserialize($product_item['ItemData']);
if (isset($item_data['AssignedCoupon']) && $item_data['AssignedCoupon']) {
$coupon_id = $item_data['AssignedCoupon'];
// clone coupon, get new coupon ID
- $coupon =& $this->Application->recallObject('coup',null,array('skip_autload' => true));
+ $coupon = $this->Application->recallObject('coup',null,array('skip_autload' => true));
/* @var $coupon kDBItem */
$coupon->Load($coupon_id);
if (!$coupon->isLoaded()) continue;
@@ -460,7 +460,7 @@
}
// call CompleteOrder events for items in order BEFORE SplitOrder (because ApproveEvents are called there)
- $order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
/* @var $order_items kDBList */
$order_items->linkToParent($order->Special);
@@ -574,7 +574,7 @@
function OnContinueShopping($event)
{
- $order_helper =& $this->Application->recallObject('OrderHelper');
+ $order_helper = $this->Application->recallObject('OrderHelper');
/* @var $order_helper OrderHelper */
$template = $this->Application->GetVar('continue_shopping_template');
@@ -776,12 +776,12 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $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));
/* @var $addr_list kDBList */
$addr_list->Query();
- $address_dummy =& $this->Application->recallObject('addr.-item', null, Array ('skip_autoload' => true));
+ $address_dummy = $this->Application->recallObject('addr.-item', null, Array ('skip_autoload' => true));
/* @var $address_dummy AddressesItem */
$address_prefixes = Array ('Billing', 'Shipping');
@@ -871,7 +871,7 @@
// 4. remove "orditems" object of kDBItem class, since getOrderInfo uses kDBList object under same prefix
$this->Application->removeObject('orditems');
- $order_helper =& $this->Application->recallObject('OrderHelper');
+ $order_helper = $this->Application->recallObject('OrderHelper');
/* @var $order_helper OrderHelper */
$event->status = kEvent::erSTOP;
@@ -927,7 +927,7 @@
$item_data = $default_item_data;
- $product =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $product = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
/* @var $product ProductsItem */
$product->Load($item_id);
@@ -958,7 +958,7 @@
{
$package_content_ids = $product->GetPackageContentIds();
- $product_package_item =& $this->Application->recallObject('p.-packageitem');
+ $product_package_item = $this->Application->recallObject('p.-packageitem');
/* @var $product_package_item ProductsItem */
$package_item_data = array();
@@ -1112,7 +1112,7 @@
if (!$options) return;
- $ord_item =& $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
+ $ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
/* @var $ord_item kDBItem */
$ord_item->Load($this->Application->GetVar('orditems_id'));
@@ -1178,7 +1178,7 @@
$object =& $event->getObject();
/* @var $object OrdersItem */
- $coupon =& $this->Application->recallObject('coup', null, Array ('skip_autoload' => true));
+ $coupon = $this->Application->recallObject('coup', null, Array ('skip_autoload' => true));
/* @var $coupon kDBItem */
$coupon->Load($code, 'Code');
@@ -1220,7 +1220,7 @@
$coupon->Update();
$this->Application->setUnitOption('ord', 'AutoLoad', true);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
/* @var $order OrdersItem */
$order->SetDBField('CouponId', $coupon->GetDBField('CouponId'));
@@ -1256,7 +1256,7 @@
*/
function RemoveCoupon(&$object)
{
- $coupon =& $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
+ $coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
/* @var $coupon kDBItem */
$coupon->Load( $object->GetDBField('CouponId') );
@@ -1426,7 +1426,7 @@
// get user
if ( $this->Application->LoggedIn() ) {
- $user =& $this->Application->recallObject('u.current');
+ $user = $this->Application->recallObject('u.current');
/* @var $user UsersItem */
$user_id = $user->GetID();
@@ -1514,7 +1514,7 @@
$order =& $event->getObject();
/* @var $order OrdersItem */
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
@@ -1645,7 +1645,7 @@
function OnReserveItems($event)
{
- $order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
/* @var $order_items kDBList */
$order_items->linkToParent('-inv');
@@ -1658,15 +1658,15 @@
// query all combinations used in this order
- $product_object =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
/* @var $product_object kCatDBItem */
$product_object->SwitchToLive();
- $order_item =& $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
/* @var $order_item kDBItem */
- $combination_item =& $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+ $combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
/* @var $combination_item kDBItem */
$combinations = $this->queryCombinations($order_items);
@@ -1871,9 +1871,9 @@
*/
function approveOrder(&$order_items)
{
- $product_object =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
- $order_item =& $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
- $combination_item =& $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+ $combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
$combinations = $this->queryCombinations($order_items);
@@ -1916,15 +1916,15 @@
*/
function restoreOrder(&$order_items)
{
- $product_object =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
/* @var $product_object kCatDBItem */
$product_object->SwitchToLive();
- $order_item =& $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
/* @var $order_item kDBItem */
- $combination_item =& $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
+ $combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
/* @var $combination_item kDBItem */
$combinations = $this->queryCombinations($order_items);
@@ -1954,7 +1954,7 @@
$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') + $rec['QuantityReserved']);
$inv_object->Update();
- $product_h =& $this->Application->recallObject('p_EventHandler');
+ $product_h = $this->Application->recallObject('p_EventHandler');
/* @var $product_h ProductsEventHandler */
if ($product_object->GetDBField('InventoryStatus') == 2) {
@@ -1993,7 +1993,7 @@
}
// process order products
- $object =& $this->Application->recallObject($event->Prefix . '.-inv', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-inv', null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$ids = $this->StoreSelectedIDs($event);
@@ -2026,14 +2026,14 @@
'OnOrderProcess' => ORDER_STATUS_TOSHIP,
);
- $order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
+ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
/* @var $order_items kDBList */
$order_items->linkToParent('-inv');
$order_items->Query();
$order_items->GoFirst();
- $object =& $this->Application->recallObject($event->Prefix.'.-inv');
+ $object = $this->Application->recallObject($event->Prefix.'.-inv');
/* @var $object OrdersItem */
if ($object->GetDBField('OnHold')) {
@@ -2073,7 +2073,7 @@
$gw_data = $object->getGatewayData();
$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 */
$charge_result = $gateway_object->Charge($object->GetFieldValues(), $gw_data['gw_params']);
@@ -2083,7 +2083,7 @@
$object->SetDBField('GWResult2', $gateway_object->getGWResponce() );
if ($charge_result) {
- $product_object =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
/* @var $product_object ProductsItem */
foreach ($order_items->Records as $product_item) {
@@ -2138,7 +2138,7 @@
if ( $gw_data ) {
$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'] );
$gateway_object->OrderDeclined($object->GetFieldValues(), $gw_data['gw_params']);
}
@@ -2162,7 +2162,7 @@
$shipping_info = $object->GetDBField('ShippingInfo');
if ($shipping_info) {
- $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector');
+ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
/* @var $quote_engine_collector ShippingQuoteCollector */
$shipping_info = unserialize($shipping_info);
@@ -2171,7 +2171,7 @@
// try to create usps order
if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false)) {
- $shipping_quote_engine =& $this->Application->recallObject($sqe_class_name);
+ $shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
/* @var $shipping_quote_engine ShippingQuoteEngine */
$ret = $shipping_quote_engine->MakeOrder($object);
@@ -2192,7 +2192,7 @@
$gw_data = $object->getGatewayData();
$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'] );
$gateway_object->OrderShipped($object->GetFieldValues(), $gw_data['gw_params']);
}
@@ -2348,7 +2348,7 @@
$object->SetDBField('PaymentCVV2', $this->Application->RecallVar('CVV2Code'));
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
@@ -2371,7 +2371,7 @@
{
parent::OnBeforeItemCreate($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
@@ -2407,7 +2407,7 @@
}
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
@@ -2444,7 +2444,7 @@
// guess fields from "One Step Checkout" form
if ( $object->GetDBField('PaymentAccount') ) {
- $order_helper =& $this->Application->recallObject('OrderHelper');
+ $order_helper = $this->Application->recallObject('OrderHelper');
/* @var $order_helper OrderHelper */
$object->SetDBField('PaymentCardType', $order_helper->getCreditCartType($object->GetDBField('PaymentAccount')));
@@ -2474,7 +2474,7 @@
$order =& $event->getObject();
/* @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);
@@ -2487,7 +2487,7 @@
$this->Application->HandleEvent(new kEvent('u.register:OnCreate'));
}
else {
- $user =& $this->Application->recallObject('u.current');
+ $user = $this->Application->recallObject('u.current');
/* @var $user UsersItem */
$user->SetFieldsFromHash($user_fields);
@@ -2817,7 +2817,7 @@
$skip_types = Array (PRODUCT_TYPE_TANGIBLE, PRODUCT_TYPE_DOWNLOADABLE);
foreach ($sub_orders as $sub_order_data) {
- $sub_order =& $this->Application->recallObject('ord.-sub'.$next_sub_number, 'ord');
+ $sub_order = $this->Application->recallObject('ord.-sub'.$next_sub_number, 'ord');
/* @var $sub_order OrdersItem */
if ($this->UseTempTables($event) && $next_sub_number == 0) {
@@ -2993,7 +2993,7 @@
function OptionsSalt($options, $comb_only=false)
{
- $helper =& $this->Application->recallObject('kProductOptionsHelper');
+ $helper = $this->Application->recallObject('kProductOptionsHelper');
return $helper->OptionsSalt($options, $comb_only);
}
@@ -3010,15 +3010,15 @@
}
// Loading product to add
- $product =& $this->Application->recallObject('p.toadd', null, Array('skip_autoload' => true));
+ $product = $this->Application->recallObject('p.toadd', null, Array('skip_autoload' => true));
/* @var $product kDBItem */
$product->Load($item_id);
- $object =& $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
/* @var $object kDBItem */
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
/* @var $order kDBItem */
if (!$order->isLoaded() && !$this->Application->isAdmin) {
@@ -3041,7 +3041,7 @@
return;
}
- $manager =& $this->Application->recallObject('OrderManager');
+ $manager = $this->Application->recallObject('OrderManager');
/* @var $manager OrderManager */
$manager->setOrder($order);
@@ -3114,7 +3114,7 @@
return;
}
- $manager =& $this->Application->recallObject('OrderManager');
+ $manager = $this->Application->recallObject('OrderManager');
/* @var $manager OrderManager */
$manager->setOrder($order);
@@ -3164,7 +3164,7 @@
/* function GetShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type)
{
$this->Application->recallObject('ShippingQuoteEngine');
- $shipping_h =& $this->Application->recallObject('CustomShippingQuoteEngine');
+ $shipping_h = $this->Application->recallObject('CustomShippingQuoteEngine');
$query = $shipping_h->QueryShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type);
$cost = $this->Conn->GetRow($query);
return $cost['TotalCost'];
@@ -3243,7 +3243,7 @@
$template = $this->Application->GetVar('t');
$shipping_templates = Array ('in-commerce/checkout/shipping', 'in-commerce/orders/orders_edit_shipping');
- $quote_engine_collector =& $this->Application->recallObject('ShippingQuoteCollector');
+ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
/* @var $quote_engine_collector ShippingQuoteCollector */
foreach ($shipping_ids as $package => $id) {
@@ -3252,7 +3252,7 @@
$sqe_class_name = $quote_engine_collector->GetClassByType($shipping_types, $package);
if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false) && in_array($template, $shipping_templates)) {
- $shipping_quote_engine =& $this->Application->recallObject($sqe_class_name);
+ $shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
/* @var $shipping_quote_engine ShippingQuoteEngine */
// USPS related part
@@ -3287,8 +3287,8 @@
/*function shipOrder(&$order_items)
{
- $product_object =& $this->Application->recallObject('p', null, Array('skip_autoload' => true));
- $order_item =& $this->Application->recallObject('orditems.-item');
+ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
+ $order_item = $this->Application->recallObject('orditems.-item');
while( !$order_items->EOL() )
{
@@ -3342,7 +3342,7 @@
{
$object =& $event->getObject();
- $coupon =& $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
+ $coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
if(!$coupon->Load( $object->GetDBField('CouponId'), 'CouponId' ))
{
return false;
@@ -3400,7 +3400,7 @@
$prefix_special = $event->Prefix.'.'.$this->getSpecialByType($order_status);
- $orders_list =& $this->Application->recallObject($prefix_special, $event->Prefix.'_List', Array('per_page'=>-1) );
+ $orders_list = $this->Application->recallObject($prefix_special, $event->Prefix.'_List', Array('per_page'=>-1) );
/* @var $orders_list kDBList */
$orders_list->Query();
@@ -3502,7 +3502,7 @@
}
// process only valid orders
- $temp_handler =& $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
$cloned_order_ids = $temp_handler->CloneItems($event->Prefix, 'recurring', $order_ids);
$order =& $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
foreach ($cloned_order_ids as $order_id) {
@@ -3558,7 +3558,7 @@
$this->Application->InitParser();
$o = $this->Application->ParseBlock(array('name'=>'in-commerce/orders/orders_pdf'));
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->CheckFolder(EXPORT_PATH);
@@ -3585,7 +3585,7 @@
@unlink($pdfFile);
- $pdf_helper =& $this->Application->recallObject('kPDFHelper');
+ $pdf_helper = $this->Application->recallObject('kPDFHelper');
$pdf_helper->FileToFile($htmlFile, $pdfFile);
return ;
@@ -3656,7 +3656,7 @@
$fields['Number']['format'] = str_replace('%06d', '%0'.$order_number.'d', $fields['Number']['format']);
$fields['SubNumber']['format'] = str_replace('%03d', '%0'.$order_sub_number.'d', $fields['SubNumber']['format']);
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$fields['BillingCountry']['default'] = $site_helper->getDefaultCountry('Billing');
@@ -3705,7 +3705,7 @@
$options = $event->getEventParam('options');
- $items_list =& $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List');
+ $items_list = $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List');
/* @var $items_list kDBList */
$items_list->SetPerPage(-1);
@@ -3719,7 +3719,7 @@
$event->setEventParam('options', $options);
- $object =& $this->Application->recallObject($event->Prefix . '.export');
+ $object = $this->Application->recallObject($event->Prefix . '.export');
/* @var $object kDBItem */
$object->SetField('Number', 999999);
@@ -3834,7 +3834,7 @@
$object =& $event->getObject();
/* @var $object OrdersItem */
- $gift_certificate =& $this->Application->recallObject('gc', null, Array ('skip_autoload' => true));
+ $gift_certificate = $this->Application->recallObject('gc', null, Array ('skip_autoload' => true));
/* @var $gift_certificate kDBItem */
$gift_certificate->Load($code, 'Code');
@@ -3976,7 +3976,7 @@
*/
function OnUpdateAjax($event)
{
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$ajax_form_helper->transitEvent($event, 'OnUpdate');
Index: branches/5.2.x/units/helpers/order_helper.php
===================================================================
diff -u -N -r14839 -r15141
--- branches/5.2.x/units/helpers/order_helper.php (.../order_helper.php) (revision 14839)
+++ branches/5.2.x/units/helpers/order_helper.php (.../order_helper.php) (revision 15141)
@@ -29,7 +29,7 @@
'errors' => $errors ? unserialize($errors) : Array (),
);
- $items =& $this->Application->recallObject('orditems', 'orditems_List', Array ('per_page' => -1));
+ $items = $this->Application->recallObject('orditems', 'orditems_List', Array ('per_page' => -1));
/* @var $items kDBList */
$items->Query();
@@ -41,7 +41,7 @@
return $ret;
}
- $product =& $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
+ $product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
/* @var $product kCatDBItem */
$sql = $product->GetSelectSQL() . '
@@ -71,7 +71,7 @@
$row_index = $items->GetDBField('ProductId') . ':' . $items->GetDBField('OptionsSalt') . ':' . $items->GetDBField('BackOrderFlag');
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
// TODO: find a way to specify thumbnail size & default image
@@ -109,7 +109,7 @@
function convertCurrency($amount, $currency)
{
- $converter =& $this->Application->recallObject('CurrencyRates');
+ $converter = $this->Application->recallObject('CurrencyRates');
/* @var $converter CurrencyRates */
// convert primary currency to selected (if they are the same, converter will just return)
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']) ) {
Index: branches/5.2.x/units/orders/order_manager.php
===================================================================
diff -u -N -r14641 -r15141
--- branches/5.2.x/units/orders/order_manager.php (.../order_manager.php) (revision 14641)
+++ branches/5.2.x/units/orders/order_manager.php (.../order_manager.php) (revision 15141)
@@ -1,6 +1,6 @@
calculator =& $this->Application->makeClass('OrderCalculator');
+ $this->calculator = $this->Application->makeClass('OrderCalculator');
$this->calculator->setManager($this);
$this->reset();
@@ -218,7 +218,7 @@
{
$ret = false;
- $order_item =& $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
+ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
/* @var $order_item kDBItem */
foreach ($this->operations as $operation) {
@@ -376,7 +376,7 @@
*/
protected function getProductField($product_id, $field)
{
- $product =& $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
+ $product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true));
/* @var $product kCatDBItem */
if ( !$product->isLoaded() || ($product->GetID() != $product_id) ) {
Index: branches/5.2.x/units/gateways/gw_classes/atosorigin.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 15141)
@@ -1,6 +1,6 @@
parseGWResponce($ret);
list ($sid, $auth_code) = explode(',', $result['caddie']);
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
$session->SID = $sid;
$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
$this->Application->SetVar('ord_id', $order_id);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
$order->Load($order_id);
return $result['response_code'] === '00' ? 1 : 0;
Index: branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$res = $curl_helper->Send($url);
@@ -92,19 +92,19 @@
$b = $_REQUEST['b'];
$url = 'https://ecomm.sella.it/CryptHTTPS/Decrypt.asp?a='.$a.'&b='.$b.'&c=2.0';
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$ret = $curl_helper->Send($url);
$result = $this->parseGWResponce($ret);
list ($sid, $auth_code) = explode(',', $result['CUSTOM_INFO']);
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
$session->SID = $sid;
$order_id = $this->Conn->GetOne('SELECT OrderId FROM '.TABLE_PREFIX.'Orders WHERE md5(OrderId) = '.$this->Conn->qstr($auth_code));
$this->Application->SetVar('ord_id', $order_id);
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
$order->Load($order_id);
if ($this->Application->GetVar('sella_ok')) {
Index: branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php (.../affiliate_plans_items_event_handler.php) (revision 15134)
+++ branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php (.../affiliate_plans_items_event_handler.php) (revision 15141)
@@ -1,6 +1,6 @@
Application->recallObject('di_EventHandler');
+ $di_handler = $this->Application->recallObject('di_EventHandler');
$di_handler->OnProcessSelected($event);
}
Index: branches/5.2.x/units/gift_certificates/gift_certificates_eh.php
===================================================================
diff -u -N -r15134 -r15141
--- branches/5.2.x/units/gift_certificates/gift_certificates_eh.php (.../gift_certificates_eh.php) (revision 15134)
+++ branches/5.2.x/units/gift_certificates/gift_certificates_eh.php (.../gift_certificates_eh.php) (revision 15141)
@@ -1,6 +1,6 @@
setRequired('RecipientEmail', false);
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
if ( !$cs_helper->CountryHasStates($object->GetDBField('RecipientCountry')) ) {
Index: branches/5.2.x/units/gateways/gw_classes/paymentech.php
===================================================================
diff -u -N -r14258 -r15141
--- branches/5.2.x/units/gateways/gw_classes/paymentech.php (.../paymentech.php) (revision 14258)
+++ branches/5.2.x/units/gateways/gw_classes/paymentech.php (.../paymentech.php) (revision 15141)
@@ -1,6 +1,6 @@
'',
);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$data['AVScountryCode'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
@@ -166,7 +166,7 @@
function setGWResponce($gw_params, $headers, $xml)
{
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetHeaders($headers);
@@ -186,7 +186,7 @@
{
if( !isset($gw_responce) ) $gw_responce = $this->gw_responce;
- $parser =& $this->Application->recallObject('kXMLHelper');
+ $parser = $this->Application->recallObject('kXMLHelper');
$parser->Clear();
$res = $parser->Parse($gw_responce);