From 4e780cb6d47e83af40b320d505dbe4d147cc3fe8 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@figureslibres.io>
Date: Mon, 14 Oct 2019 10:35:12 +0200
Subject: [PATCH] updated ubercart contrib module

---
 .../payment/uc_2checkout/uc_2checkout.info    |  6 +--
 .../uc_authorizenet/uc_authorizenet.info      |  6 +--
 .../uc_authorizenet/uc_authorizenet.module    |  4 +-
 .../payment/uc_credit/tests/test_gateway.info |  6 +--
 .../ubercart/payment/uc_credit/uc_credit.info |  6 +--
 .../uc_cybersource/uc_cybersource.info        |  6 +--
 .../uc_cybersource/uc_cybersource.install     |  2 +-
 .../uc_cybersource/uc_cybersource.module      |  2 +-
 .../uc_cybersource/uc_cybersource.soap.inc    |  4 +-
 .../uc_google_checkout.info                   |  6 +--
 .../payment/uc_payment/uc_payment-rtl.css     |  2 +-
 .../payment/uc_payment/uc_payment.info        |  6 +--
 .../uc_payment_pack/uc_payment_pack.info      |  6 +--
 .../uc_payment_pack/uc_payment_pack.module    | 14 +++---
 .../ubercart/payment/uc_paypal/uc_paypal.info |  6 +--
 .../shipping/uc_flatrate/uc_flatrate.info     |  6 +--
 .../shipping/uc_flatrate/uc_flatrate.module   | 10 ++--
 .../shipping/uc_quote/uc_quote-rtl.css        |  2 +-
 .../shipping/uc_quote/uc_quote.admin.inc      |  6 +--
 .../ubercart/shipping/uc_quote/uc_quote.info  |  6 +--
 .../shipping/uc_quote/uc_quote.module         |  8 ++--
 .../shipping/uc_quote/uc_quote.pages.inc      |  4 +-
 .../shipping/uc_shipping/uc_shipping.info     |  6 +--
 .../shipping/uc_shipping/uc_shipping.install  |  2 +-
 .../shipping/uc_shipping/uc_shipping.module   |  8 ++--
 .../ubercart/shipping/uc_ups/uc_ups.info      |  6 +--
 .../ubercart/shipping/uc_usps/uc_usps.info    |  6 +--
 .../uc_weightquote/uc_weightquote.info        |  6 +--
 .../uc_weightquote/uc_weightquote.module      | 12 ++---
 .../ubercart/uc_ajax_admin/uc_ajax_admin.info |  6 +--
 .../uc_attribute/tests/uc_attribute.test      |  6 +--
 .../ubercart/uc_attribute/uc_attribute.info   |  6 +--
 .../uc_cart/tests/uc_cart_entity_test.info    |  6 +--
 .../ecommerce/ubercart/uc_cart/uc_cart.info   |  6 +--
 .../ubercart/uc_cart/uc_cart_block-rtl.css    |  2 +-
 .../uc_cart_links/uc_cart_links.admin.inc     |  4 +-
 .../ubercart/uc_cart_links/uc_cart_links.info |  6 +--
 .../ubercart/uc_catalog/uc_catalog.info       |  6 +--
 .../ubercart/uc_file/uc_file.admin.inc        | 47 +++++++++++++------
 .../ecommerce/ubercart/uc_file/uc_file.info   |  6 +--
 .../uc_googleanalytics.info                   |  6 +--
 .../ubercart/uc_order/uc_order-rtl.css        |  2 +-
 .../ecommerce/ubercart/uc_order/uc_order.info |  6 +--
 .../ubercart/uc_order/uc_order.module         |  3 ++
 .../ubercart/uc_product/uc_product-rtl.css    |  2 +-
 .../ubercart/uc_product/uc_product.info       |  6 +--
 .../uc_product_kit/uc_product_kit-rtl.css     |  2 +-
 .../uc_product_kit/uc_product_kit.info        |  6 +--
 .../ubercart/uc_reports/uc_reports.info       |  6 +--
 .../ecommerce/ubercart/uc_roles/uc_roles.info |  6 +--
 .../ecommerce/ubercart/uc_stock/uc_stock.info |  6 +--
 .../ubercart/uc_store/uc_store-rtl.css        |  2 +-
 .../ecommerce/ubercart/uc_store/uc_store.info |  6 +--
 .../ubercart/uc_tax_report/uc_tax_report.info |  6 +--
 .../ecommerce/ubercart/uc_taxes/uc_taxes.info |  6 +--
 55 files changed, 181 insertions(+), 161 deletions(-)

diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_2checkout/uc_2checkout.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_2checkout/uc_2checkout.info
index b5f5d6d2..af5be60c 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_2checkout/uc_2checkout.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_2checkout/uc_2checkout.info
@@ -4,8 +4,8 @@ dependencies[] = uc_payment
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.info
index 1d6dbb69..4fd9ed74 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.info
@@ -5,8 +5,8 @@ dependencies[] = uc_credit
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.module b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.module
index 45eafdd1..7b7e4f26 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_authorizenet/uc_authorizenet.module
@@ -391,7 +391,7 @@ function _uc_authorizenet_cim_payment_profile_get($order, $profile_id, $payment_
 }
 
 /**
- * Handles authorizations and captures through AIM at Authorize.Net
+ * Handles authorizations and captures through AIM at Authorize.net.
  */
 function _uc_authorizenet_charge($order, $amount, $data) {
   global $user;
@@ -523,7 +523,7 @@ function _uc_authorizenet_charge($order, $amount, $data) {
     $response[$i] = substr($response[$i], 1, strlen($response[$i]) - 2);
   }
 
-  /**
+  /*
    * Response key index:
    * 0 = Response Code
    * 2 = Response Reason Code
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/tests/test_gateway.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/tests/test_gateway.info
index 80441b84..e59bab55 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/tests/test_gateway.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/tests/test_gateway.info
@@ -5,8 +5,8 @@ dependencies[] = uc_credit
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/uc_credit.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/uc_credit.info
index 97bab4c9..c41b6e86 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/uc_credit.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_credit/uc_credit.info
@@ -8,8 +8,8 @@ core = 7.x
 ; Test cases
 files[] = tests/uc_credit.test
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.info
index 2e9297b2..732a239e 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.info
@@ -7,8 +7,8 @@ core = 7.x
 ; Class definitions
 files[] = uc_cybersource.soap.inc
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.install b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.install
index c345adb9..09197064 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.install
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.install
@@ -139,7 +139,7 @@ function uc_cybersource_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-     'received' => array(
+      'received' => array(
         'description' => 'The IPN receipt timestamp.',
         'type' => 'int',
         'unsigned' => TRUE,
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.module b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.module
index cbf61fc2..e4481151 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.module
@@ -485,7 +485,7 @@ function uc_cybersource_hop_form($form, $form_state, $order) {
   $data['orderPage_sendMerchantReceiptEmail'] = variable_get('uc_cybersource_hop_merchant_receipt_email', 'true');
   $data['orderPage_sendMerchantURLPost'] = 'true';
   // CyberSource posts payment confirmation to this URL.
-  $data['orderPage_merchantURLPostAddress']= url('cybersource/hop-post', array('absolute' => TRUE));
+  $data['orderPage_merchantURLPostAddress'] = url('cybersource/hop-post', array('absolute' => TRUE));
   $data['orderPage_buyButtonText'] = t('Checkout');
   $receipt_url = url('cybersource/hop-complete/' . $order->order_id, array('absolute' => TRUE));
   $data['orderPage_receiptResponseURL'] = $receipt_url;
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.soap.inc b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.soap.inc
index bfae58ad..1bfea9a0 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.soap.inc
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_cybersource/uc_cybersource.soap.inc
@@ -16,7 +16,7 @@ class CyberSourceSoapClient extends SoapClient {
   /**
    * Inserts the UsernameToken information in the outgoing request.
    */
-  function __doRequest($request, $location, $action, $version) {
+  function __doRequest($request, $location, $action, $version, $one_way = 0) {
     $login = _uc_cybersource_soap_login_data();
 
     $soapHeader = '<SOAP-ENV:Header xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><wsse:Security SOAP-ENV:mustUnderstand="1"><wsse:UsernameToken><wsse:Username>' . $login['merchant_id'] . '</wsse:Username><wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">' . $login['transaction_key'] . '</wsse:Password></wsse:UsernameToken></wsse:Security></SOAP-ENV:Header>';
@@ -35,7 +35,7 @@ class CyberSourceSoapClient extends SoapClient {
       die('Error adding UsernameToken: ' . $e->code);
     }
 
-    return parent::__doRequest($request, $location, $action, $version);
+    return parent::__doRequest($request, $location, $action, $version, $one_way);
   }
 
 }
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_google_checkout/uc_google_checkout.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_google_checkout/uc_google_checkout.info
index 6cb846ef..23207301 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_google_checkout/uc_google_checkout.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_google_checkout/uc_google_checkout.info
@@ -6,8 +6,8 @@ dependencies[] = uc_quote
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment-rtl.css
index 305efc8a..89d77a8a 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for uc_payment module.
+ * RTL Styles for uc_payment module.
  */
 
 .payment-details-cod .form-item {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment.info
index cb54ec8d..809c769a 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment/uc_payment.info
@@ -10,8 +10,8 @@ files[] = tests/uc_payment.test
 
 configure = admin/store/settings/payment
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.info
index 7a3cfedc..6da743a5 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.info
@@ -5,8 +5,8 @@ dependencies[] = uc_payment
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.module b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.module
index 22bd904f..336abc6e 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_payment_pack/uc_payment_pack.module
@@ -113,12 +113,12 @@ function uc_payment_method_cod($op, &$order, $form = NULL, $form_state = NULL) {
   switch ($op) {
     case 'cart-details':
       $build['policy'] = array(
-        '#markup' => '<p>' . variable_get('uc_cod_policy', t('Full payment is expected upon delivery or prior to pick-up.')) . '</p>'
+        '#markup' => '<p>' . variable_get('uc_cod_policy', t('Full payment is expected upon delivery or prior to pick-up.')) . '</p>',
       );
 
       if (($max = variable_get('uc_cod_max_order', 0)) > 0 && is_numeric($max)) {
         $build['eligibility'] = array(
-          '#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>'
+          '#markup' => '<p>' . t('Orders totalling more than !number are <b>not eligible</b> for COD.', array('!number' => uc_currency_format($max))) . '</p>',
         );
       }
 
@@ -186,7 +186,7 @@ function uc_payment_method_cod($op, &$order, $form = NULL, $form_state = NULL) {
           $order->order_total > $max) {
         $result[] = array(
           'pass' => FALSE,
-          'message' => t('Your final order total exceeds the maximum for COD payment.  Please go back and select a different method of payment.')
+          'message' => t('Your final order total exceeds the maximum for COD payment.  Please go back and select a different method of payment.'),
         );
         $_SESSION['expanded_panes'][] = 'payment';
         return $result;
@@ -264,7 +264,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
   switch ($op) {
     case 'cart-details':
       $build['instructions'] = array(
-        '#markup' => t('Checks should be made out to:')
+        '#markup' => t('Checks should be made out to:'),
       );
 
       if (!variable_get('uc_check_mailing_street1', FALSE)) {
@@ -303,7 +303,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
       }
 
       $build['policy'] = array(
-        '#markup' => '<p>' . variable_get('uc_check_policy', '') . '</p>'
+        '#markup' => '<p>' . variable_get('uc_check_policy', '') . '</p>',
       );
       return $build;
 
@@ -321,7 +321,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
             variable_get('uc_store_zone', ''),
             variable_get('uc_store_postal_code', ''),
             variable_get('uc_store_country', 840)
-          )
+          ),
         );
       }
       else {
@@ -337,7 +337,7 @@ function uc_payment_method_check($op, &$order, $form = NULL, &$form_state = NULL
             variable_get('uc_check_mailing_zone', ''),
             variable_get('uc_check_mailing_postal_code', ''),
             variable_get('uc_check_mailing_country', 840)
-          )
+          ),
         );
       }
       return $review;
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_paypal/uc_paypal.info b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_paypal/uc_paypal.info
index 21397115..439895b6 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_paypal/uc_paypal.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/payment/uc_paypal/uc_paypal.info
@@ -4,8 +4,8 @@ dependencies[] = uc_payment
 package = Ubercart - payment
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.info
index f977ab7d..11529f3d 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.info
@@ -6,8 +6,8 @@ core = 7.x
 
 configure = admin/store/settings/quotes/methods
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.module b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.module
index 669c28ce..a898432c 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_flatrate/uc_flatrate.module
@@ -101,11 +101,11 @@ function uc_flatrate_node_update($node) {
       foreach ($node->flatrate as $mid => $rate) {
         if (is_numeric($rate) && $rate >= 0) {
           $query->values(array(
-              'vid' => $node->vid,
-              'nid' => $node->nid,
-              'mid' => $mid,
-              'rate' => $rate,
-            ));
+            'vid' => $node->vid,
+            'nid' => $node->nid,
+            'mid' => $mid,
+            'rate' => $rate,
+          ));
         }
       }
 
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote-rtl.css
index b085ea79..826b2212 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for shipping quote cart and checkout panes.
+ * RTL Styles for shipping quote cart and checkout panes.
  */
 
 #uc-cart-pane-quotes .form-submit {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.admin.inc b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.admin.inc
index 42e65fa6..b7458aee 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.admin.inc
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.admin.inc
@@ -75,7 +75,7 @@ function uc_quote_admin_settings($form, &$form_state) {
   );
 
   $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
   return $form;
 }
 
@@ -200,7 +200,7 @@ function uc_quote_method_settings($form, &$form_state) {
   );
 
   $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
 
   return $form;
 }
@@ -216,7 +216,7 @@ function theme_uc_quote_method_settings($variables) {
 
   drupal_add_tabledrag('uc-quote-methods', 'order', 'sibling', 'uc-quote-method-weight');
 
-  $header = array(t('Shipping method'), t('Details'),  array('data' => t('List position'), 'sort' => 'asc'), t('Operations'));
+  $header = array(t('Shipping method'), t('Details'), array('data' => t('List position'), 'sort' => 'asc'), t('Operations'));
   $rows = array();
   foreach (element_children($form['methods']) as $method) {
     $row = array(
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.info
index 2dbfdfdb..eb2afa3f 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.info
@@ -9,8 +9,8 @@ configure = admin/store/settings/quotes
 ; Test cases
 files[] = tests/uc_quote.test
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.module b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.module
index 6086f9dd..9b7ed845 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.module
@@ -562,7 +562,7 @@ function uc_checkout_pane_quotes($op, &$order, $form = NULL, &$form_state = NULL
 
       $form_state['uc_ajax']['uc_quote']['panes][quotes][quote_button'] = array(
         'payment-pane' => 'uc_ajax_replace_checkout_pane',
-        'quotes-pane' => 'uc_ajax_replace_checkout_pane'
+        'quotes-pane' => 'uc_ajax_replace_checkout_pane',
       );
       $form_state['uc_ajax']['uc_quote']['panes][quotes][quotes][quote_option'] = array(
         'payment-pane' => 'uc_ajax_replace_checkout_pane',
@@ -768,7 +768,7 @@ function uc_quote_apply_quote_to_order($form, &$form_state) {
         );
       }
 
-      // Save selected shipping
+      // Save selected shipping.
       uc_quote_uc_order('save', $order, '');
 
       // Update line items.
@@ -902,8 +902,8 @@ function uc_quote_replace_order_quotes($form, $form_state) {
 }
 
 /**
-* AJAX callback for applying shipping rates.
-*/
+ * AJAX callback for applying shipping rates.
+ */
 function uc_quote_order_update_rates($form, $form_state) {
   // Update shipping line item.
   if (isset($form_state['uc_quote'])) {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.pages.inc b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.pages.inc
index e800c53a..6bb2b657 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.pages.inc
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_quote/uc_quote.pages.inc
@@ -22,7 +22,7 @@ function uc_quote_assemble_quotes($order) {
 
   $shipping_types = array();
   foreach ($products as $product) {
-    $shipping_types[] =  uc_product_get_shipping_type($product);
+    $shipping_types[] = uc_product_get_shipping_type($product);
   }
 
   $shipping_types = array_unique($shipping_types);
@@ -83,7 +83,7 @@ function uc_quote_action_get_quote($order, $method) {
     }
   }
   ob_start();
-  // Load include file containing quote callback, if there is one
+  // Load include file containing quote callback, if there is one.
   if (isset($method['quote']['file'])) {
     $inc_file = drupal_get_path('module', $method['module']) . '/' . $method['quote']['file'];
     if (is_file($inc_file)) {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.info
index 51bccfee..8df1adec 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.info
@@ -8,8 +8,8 @@ core = 7.x
 files[] = views/uc_shipping_handler_field_shipment_id.inc
 files[] = views/uc_shipping_handler_field_package_weight.inc
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.install b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.install
index 522a26a2..52615568 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.install
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.install
@@ -228,7 +228,7 @@ function uc_shipping_schema() {
     ),
     'indexes' => array(
       'order_id' => array('order_id'),
-     ),
+    ),
   );
 
   $schema['uc_packages'] = array(
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.module b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.module
index 27063dec..da725818 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_shipping/uc_shipping.module
@@ -457,10 +457,10 @@ function uc_shipping_package_save($package) {
 
     foreach ($package->products as $id => $product) {
       $insert->values(array(
-          'package_id' => $package->package_id,
-          'order_product_id' => $id,
-          'qty' => $product->qty,
-        ));
+        'package_id' => $package->package_id,
+        'order_product_id' => $id,
+        'qty' => $product->qty,
+      ));
 
       $result = db_query("SELECT data FROM {uc_order_products} WHERE order_product_id = :id", array(':id' => $id));
       if ($order_product = $result->fetchObject()) {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_ups/uc_ups.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_ups/uc_ups.info
index 0d205a06..93744adb 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_ups/uc_ups.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_ups/uc_ups.info
@@ -6,8 +6,8 @@ core = 7.x
 
 configure = admin/store/settings/quotes/settings/ups
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.info
index 39e34aaa..77629f61 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_usps/uc_usps.info
@@ -6,8 +6,8 @@ core = 7.x
 
 configure = admin/store/settings/quotes/settings/usps
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.info b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.info
index 3e519e3d..b624cca2 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.info
@@ -6,8 +6,8 @@ core = 7.x
 
 configure = admin/store/settings/quotes/methods
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.module b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.module
index 9779aa33..bcdb0191 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/shipping/uc_weightquote/uc_weightquote.module
@@ -103,11 +103,11 @@ function uc_weightquote_node_update($node) {
       foreach ($node->weightquote as $mid => $rate) {
         if (is_numeric($rate) && $rate >= 0) {
           $query->values(array(
-              'vid' => $node->vid,
-              'nid' => $node->nid,
-              'mid' => $mid,
-              'rate' => $rate,
-            ));
+            'vid' => $node->vid,
+            'nid' => $node->nid,
+            'mid' => $mid,
+            'rate' => $rate,
+          ));
         }
       }
 
@@ -222,7 +222,7 @@ function uc_weightquote_quote($products, $details, $method) {
         // Add the product-specific rate.
         $product_rate = $product->weightquote[$mid] * $product->qty;
       }
-      $rate += $product_rate  * $product->weight * uc_weight_conversion($product->weight_units, variable_get('uc_weight_unit', 'lb'));
+      $rate += $product_rate * $product->weight * uc_weight_conversion($product->weight_units, variable_get('uc_weight_unit', 'lb'));
     }
 
     $quotes[] = array(
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_ajax_admin/uc_ajax_admin.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_ajax_admin/uc_ajax_admin.info
index e023ed2f..33b88aea 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_ajax_admin/uc_ajax_admin.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_ajax_admin/uc_ajax_admin.info
@@ -4,8 +4,8 @@ dependencies[] = uc_cart
 package = Ubercart - extra
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/tests/uc_attribute.test b/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/tests/uc_attribute.test
index 5b4176ce..52884c0d 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/tests/uc_attribute.test
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/tests/uc_attribute.test
@@ -316,7 +316,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
     $edit = (array) self::createAttribute(array(), FALSE);
 
     $this->drupalPost('admin/store/products/attributes/add', $edit, t('Submit'));
-    if ($edit['display'] !=0) {
+    if ($edit['display'] != 0) {
       // We redirect to add options page ONLY for non-textfield attributes.
       $this->assertText('Options for ' . $edit['name']);
       $this->assertText('No options for this attribute have been added yet.');
@@ -650,7 +650,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
     $this->clickLink('Add an attribute');
     $this->assertText($attribute->name);
 
-    $this->drupalPost(NULL, array('add_attributes[' . $attribute->aid. ']' => 1), t('Add attributes'));
+    $this->drupalPost(NULL, array('add_attributes[' . $attribute->aid . ']' => 1), t('Add attributes'));
     $this->assertText('1 attribute has been added.');
     $this->assertText($attribute->name, 'Attribute name found');
     $this->assertFieldByName('attributes[' . $attribute->aid . '][label]', $attribute->label, 'Attribute label found');
@@ -662,7 +662,7 @@ class UbercartAttributeTestCase extends UbercartTestHelper {
     $this->assertNoText($attribute->name);
     $this->assertText('No attributes left to add.');
 
-    $edit = array('attributes[' . $attribute->aid. '][remove]' => 1);
+    $edit = array('attributes[' . $attribute->aid . '][remove]' => 1);
     $this->drupalPost('node/' . $product->nid . '/edit/attributes', $edit, t('Save changes'));
     $this->assertText('You must first add attributes to this product.');
   }
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/uc_attribute.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/uc_attribute.info
index 4fb83d12..8458308c 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/uc_attribute.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_attribute/uc_attribute.info
@@ -8,8 +8,8 @@ core = 7.x
 files[] = tests/uc_attribute.test
 files[] = tests/uc_attribute_checkout.test
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/tests/uc_cart_entity_test.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/tests/uc_cart_entity_test.info
index e4ef914f..58aab5be 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/tests/uc_cart_entity_test.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/tests/uc_cart_entity_test.info
@@ -3,8 +3,8 @@ core = 7.x
 dependencies[] = uc_cart
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart.info
index aeae73f2..6ee3b2a0 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart.info
@@ -16,8 +16,8 @@ files[] = uc_cart.controller.inc
 
 configure = admin/store/settings/cart
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart_block-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart_block-rtl.css
index 528fe7ff..3777ff0a 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart_block-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart/uc_cart_block-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for the uc_cart module cart block.
+ * RTL Styles for the uc_cart module cart block.
  */
 
 .cart-block-icon-full,
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.admin.inc b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.admin.inc
index e094d17b..2955b5a6 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.admin.inc
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.admin.inc
@@ -63,13 +63,13 @@ function uc_cart_links_settings_form_validate($form, &$form_state) {
     foreach ($data as $message) {
       // Ignore blank lines.
       if (preg_match('/^\s*$/', $message)) {
-         continue;
+        continue;
       }
       // Check for properly formattted messages.
       // Each line must be one or more numeric characters for the key followed
       // by "|" followed by one or more characters for the value. Both the key
       // and the value may have leading and/or trailing whitespace.
-      else if (!preg_match('/^\s*[1-9][0-9]*\s*\|\s*\S+.*$/', $message)) {
+      elseif (!preg_match('/^\s*[1-9][0-9]*\s*\|\s*\S+.*$/', $message)) {
         form_set_error('uc_cart_links_messages', t('Invalid Cart Links message "%message". Messages must be a numeric key followed by "|" followed by a value.', array('%message' => $message)));
         break;
       }
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.info
index bcdae15b..59bab967 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_cart_links/uc_cart_links.info
@@ -9,8 +9,8 @@ files[] = tests/uc_cart_links.test
 
 configure = admin/store/settings/cart-links
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_catalog/uc_catalog.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_catalog/uc_catalog.info
index 4ea16c7d..1ac811ba 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_catalog/uc_catalog.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_catalog/uc_catalog.info
@@ -15,8 +15,8 @@ files[] = tests/uc_catalog.test
 
 configure = admin/store/settings/catalog
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.admin.inc b/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.admin.inc
index 1d97d73e..f88b96ce 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.admin.inc
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.admin.inc
@@ -22,10 +22,10 @@ define('UC_FILE_FORM_ACTION', 1   );
 function uc_file_admin_files_form($form, &$form_state) {
 
   if (isset($form_state['storage']['step']) && $form_state['storage']['step'] == UC_FILE_FORM_ACTION) {
-      return array(
-        '#validate' => array('uc_file_admin_files_form_action_validate'),
-        '#submit'   => array('uc_file_admin_files_form_action_submit'),
-      ) + $form + uc_file_admin_files_form_action($form, $form_state);
+    return array(
+      '#validate' => array('uc_file_admin_files_form_action_validate'),
+      '#submit'   => array('uc_file_admin_files_form_action_submit'),
+    ) + $form + uc_file_admin_files_form_action($form, $form_state);
   }
   else {
     // Refresh our file list before display.
@@ -283,15 +283,31 @@ function uc_file_admin_files_form_action($form, &$form_state) {
       break;
 
     case 'uc_file_upload':
-      // Calculate the max size of uploaded files, in bytes.
-      $max_bytes = trim(ini_get('post_max_size'));
-      switch (strtolower($max_bytes{strlen($max_bytes) - 1})) {
-        case 'g':
-          $max_bytes *= 1024;
-        case 'm':
-          $max_bytes *= 1024;
-        case 'k':
-          $max_bytes *= 1024;
+      // Calculate the maximum size of uploaded files in bytes.
+      $post_max_size = ini_get('post_max_size');
+      if (is_numeric($post_max_size)) {
+        // Handle the case where 'post_max_size' has no suffix.
+        // An explicit cast is needed because floats are not allowed.
+        $max_bytes = (int) $post_max_size;
+      }
+      else {
+        // Handle the case where 'post_max_size' has a suffix of
+        // 'M', 'K', or 'G' (case insensitive).
+        $max_bytes = (int) substr($post_max_size, 0, -1);
+        $suffix = strtolower(substr($post_max_size, -1));
+        switch ($suffix) {
+          case 'k':
+            $max_bytes *= 1024;
+            break;
+
+          case 'm':
+            $max_bytes *= 1048576;
+            break;
+
+          case 'g':
+            $max_bytes *= 1073741824;
+            break;
+        }
       }
 
       // Gather list of directories under the selected one(s).
@@ -313,7 +329,9 @@ function uc_file_admin_files_form_action($form, &$form_state) {
       $form['upload'] = array(
         '#type' => 'file',
         '#title' => t('File'),
-        '#description' => t('The maximum file size that can be uploaded is %size bytes. You will need to use a different method to upload the file to the directory (e.g. (S)FTP, SCP) if your file exceeds this size. Files you upload using one of these alternate methods will be automatically detected.', array('%size' => number_format($max_bytes))),
+        // Deliberately concatenate the strings to preserve backwards
+        // compatibility with existing translations.
+        '#description' => t('The maximum file size that can be uploaded is %size bytes. You will need to use a different method to upload the file to the directory (e.g. (S)FTP, SCP) if your file exceeds this size. Files you upload using one of these alternate methods will be automatically detected.', array('%size' => number_format($max_bytes))) . ' ' . t("Note: A value of '0' means there is no size limit."),
       );
 
       $form['#attributes']['class'][] = 'foo';
@@ -375,7 +393,6 @@ function uc_file_admin_files_form_action_validate($form, &$form_state) {
       break;
 
     default:
-
       // This action isn't handled by us, so check if any
       // hook_uc_file_action('validate', $args) are implemented.
       foreach (module_implements('uc_file_action') as $module) {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.info
index dbdc399c..3b9ccff2 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_file/uc_file.info
@@ -11,8 +11,8 @@ files[] = tests/uc_file.test
 stylesheets[all][] = uc_file.css
 scripts[] = uc_file.js
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_googleanalytics/uc_googleanalytics.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_googleanalytics/uc_googleanalytics.info
index d83b47d1..f53376db 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_googleanalytics/uc_googleanalytics.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_googleanalytics/uc_googleanalytics.info
@@ -7,8 +7,8 @@ dependencies[] = uc_store
 package = Ubercart - extra
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order-rtl.css
index 122edec4..0313ca72 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for uc_order module.
+ * RTL Styles for uc_order module.
  */
 
 .view-uc-orders #edit-delivery-first-name-wrapper,
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.info
index 682c920f..3fe11e95 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.info
@@ -39,8 +39,8 @@ files[] = uc_order.info.inc
 configure = admin/store/settings/orders
 stylesheets[all][] = uc_order.css
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.module b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.module
index f09cdc97..230f5040 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.module
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_order/uc_order.module
@@ -1481,6 +1481,7 @@ function uc_order_load_line_items_display($order) {
     }
   }
   foreach ($line_items as &$item) {
+    $item['title'] = check_plain($item['title']);
     $item['formatted_amount'] = uc_currency_format($item['amount']);
   }
 
@@ -1776,6 +1777,8 @@ function template_preprocess_uc_order(&$variables) {
   $variables['products'] = $order->products;
   $display = uc_order_product_view_multiple($order->products);
   foreach ($variables['products'] as &$product) {
+    $product->title = check_plain($product->title);
+    $product->model = check_plain($product->model);
     $product->total_price = render($display['uc_order_product'][$product->order_product_id]['total']);
     if ($product->qty > 1) {
       $product->individual_price = t('(!price each)', array('!price' => uc_currency_format($display['uc_order_product'][$product->order_product_id]['price']['#price'])));
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product-rtl.css
index 8249ba75..8c8c6e72 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for uc_product module.
+ * RTL Styles for uc_product module.
  */
 
 .product-image {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product.info
index 4e6792db..1b342d6f 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_product/uc_product.info
@@ -20,8 +20,8 @@ files[] = views/uc_product_handler_filter_product.inc
 configure = admin/store/settings/products
 stylesheets[all][] = uc_product.css
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit-rtl.css
index bec2f9c3..2528223a 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for uc_product_kit module.
+ * RTL Styles for uc_product_kit module.
  */
 
 #block-cart-contents .kit-component-cart-desc ul.product-description {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit.info
index ecc1cef7..37966bf5 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_product_kit/uc_product_kit.info
@@ -10,8 +10,8 @@ files[] = tests/uc_product_kit.test
 files[] = views/uc_product_kit_handler_filter_product_kit.inc
 files[] = views/uc_product_kit_handler_filter_product_kit_item.inc
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_reports/uc_reports.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_reports/uc_reports.info
index ba0b477d..95fe8797 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_reports/uc_reports.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_reports/uc_reports.info
@@ -7,8 +7,8 @@ core = 7.x
 
 configure = admin/store/settings/store
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_roles/uc_roles.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_roles/uc_roles.info
index 0d23935d..d07c5dfa 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_roles/uc_roles.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_roles/uc_roles.info
@@ -11,8 +11,8 @@ files[] = tests/uc_roles.test
 ; Views handlers
 files[] = views/uc_roles_handler_field_rid.inc
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_stock/uc_stock.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_stock/uc_stock.info
index a974cc28..ce5cab7b 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_stock/uc_stock.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_stock/uc_stock.info
@@ -12,8 +12,8 @@ files[] = views/uc_stock_handler_filter_below_threshold.inc
 
 configure = admin/store/settings/stock
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store-rtl.css b/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store-rtl.css
index ebed7aa4..e527c886 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store-rtl.css
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store-rtl.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Styles for uc_store module.
+ * RTL Styles for uc_store module.
  */
 
 .uc-inline-form .form-item {
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store.info
index 7c95bff9..bac076c6 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_store/uc_store.info
@@ -16,8 +16,8 @@ files[] = tests/uc_ajax.test
 configure = admin/store/settings/store
 stylesheets[all][] = uc_store.css
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_tax_report/uc_tax_report.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_tax_report/uc_tax_report.info
index 11b00e1c..cc6ca9c4 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_tax_report/uc_tax_report.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_tax_report/uc_tax_report.info
@@ -5,8 +5,8 @@ dependencies[] = uc_taxes
 package = Ubercart - core (optional)
 core = 7.x
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"
diff --git a/sites/all/modules/contrib/ecommerce/ubercart/uc_taxes/uc_taxes.info b/sites/all/modules/contrib/ecommerce/ubercart/uc_taxes/uc_taxes.info
index 1ef1b0ba..110805fa 100644
--- a/sites/all/modules/contrib/ecommerce/ubercart/uc_taxes/uc_taxes.info
+++ b/sites/all/modules/contrib/ecommerce/ubercart/uc_taxes/uc_taxes.info
@@ -11,8 +11,8 @@ files[] = tests/uc_taxes.test
 
 configure = admin/store/settings/taxes
 
-; Information added by Drupal.org packaging script on 2019-03-06
-version = "7.x-3.12"
+; Information added by Drupal.org packaging script on 2019-10-01
+version = "7.x-3.13"
 core = "7.x"
 project = "ubercart"
-datestamp = "1551862392"
+datestamp = "1569942207"