Merge pull request #134 from haraldpdl/worldpay

Fix $order variable collision

Author: haraldpdl

catalog/includes/modules/payment/rbsworldpay_hosted.php

@@ -16,7 +16,7 @@ class rbsworldpay_hosted {
     function rbsworldpay_hosted() {
       global $order;
 
-      $this->signature = 'rbs|worldpay_hosted|2.1|2.3';
+      $this->signature = 'rbs|worldpay_hosted|2.2|2.3';
       $this->api_version = '4.6';
 
       $this->code = 'rbsworldpay_hosted';
@@ -341,19 +341,19 @@ function before_process() {
         tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
       }
 
-      $order_query = tep_db_query("select orders_status from " . TABLE_ORDERS . " where orders_id = '" . (int)$order_id . "' and customers_id = '" . (int)$customer_id . "'");
+      $check_query = tep_db_query("select orders_status from " . TABLE_ORDERS . " where orders_id = '" . (int)$order_id . "' and customers_id = '" . (int)$customer_id . "'");
 
-      if (!tep_db_num_rows($order_query)) {
+      if (!tep_db_num_rows($check_query)) {
         $this->sendDebugEmail();
 
         tep_redirect(tep_href_link(FILENAME_SHOPPING_CART));
       }
 
-      $order = tep_db_fetch_array($order_query);
+      $check = tep_db_fetch_array($check_query);
 
       $order_status_id = (MODULE_PAYMENT_RBSWORLDPAY_HOSTED_ORDER_STATUS_ID > 0 ? (int)MODULE_PAYMENT_RBSWORLDPAY_HOSTED_ORDER_STATUS_ID : (int)DEFAULT_ORDERS_STATUS_ID);
 
-      if ($order['orders_status'] == MODULE_PAYMENT_RBSWORLDPAY_HOSTED_PREPARE_ORDER_STATUS_ID) {
+      if ($check['orders_status'] == MODULE_PAYMENT_RBSWORLDPAY_HOSTED_PREPARE_ORDER_STATUS_ID) {
         tep_db_query("update " . TABLE_ORDERS . " set orders_status = '" . $order_status_id . "', last_modified = now() where orders_id = '" . (int)$order_id . "'");
 
         $sql_data_array = array('orders_id' => $order_id,