#556010: Ubercart should use drupal_json().

From: Damien Tournoud <damien@tournoud.net>


---

 shipping/uc_quote/uc_quote.pages.inc |    4 +---
 uc_file/uc_file.module               |    3 +--
 uc_product/uc_product.pages.inc      |    3 +--
 uc_taxes/uc_taxes.module             |   13 +------------
 4 files changed, 4 insertions(+), 19 deletions(-)


diff --git shipping/uc_quote/uc_quote.pages.inc shipping/uc_quote/uc_quote.pages.inc
index c04a64a..059120c 100644
--- shipping/uc_quote/uc_quote.pages.inc
+++ shipping/uc_quote/uc_quote.pages.inc
@@ -68,9 +68,7 @@ function uc_quote_request_quotes() {
       $return_quotes[$method_id .'---'. $accsrl] = $data;
     }
   }
-  drupal_set_header("Content-Type: text/javascript; charset=utf-8");
-  print drupal_to_js($return_quotes);
-  exit();
+  drupal_json($return_quotes);
 }
 
 /**
diff --git uc_file/uc_file.module uc_file/uc_file.module
index f89e55f..b8a8398 100644
--- uc_file/uc_file.module
+++ uc_file/uc_file.module
@@ -1199,8 +1199,7 @@ function _uc_file_autocomplete_filename() {
   }
   asort($matches);
 
-  print drupal_to_js($matches);
-  exit();
+  drupal_json($matches);
 }
 
 /**
diff --git uc_product/uc_product.pages.inc uc_product/uc_product.pages.inc
index 155c528..882efda 100644
--- uc_product/uc_product.pages.inc
+++ uc_product/uc_product.pages.inc
@@ -22,7 +22,6 @@ function uc_product_title_sku_autocomplete($string = '') {
     }
   }
 
-  print drupal_to_js($matches);
-  exit();
+  drupal_json($matches);
 }
 
diff --git uc_taxes/uc_taxes.module uc_taxes/uc_taxes.module
index 76dbc50..4eaa2c0 100644
--- uc_taxes/uc_taxes.module
+++ uc_taxes/uc_taxes.module
@@ -448,7 +448,6 @@ function uc_taxes_calculate_tax($order) {
  * Calculate tax amounts for an order in the payment checkout pane.
  */
 function uc_taxes_javascript() {
-  drupal_set_header("Content-Type: text/javascript; charset=utf-8");
   $order = $_POST['order'];
   if ($order = unserialize(rawurldecode($order))) {
     $taxes = module_invoke_all('calculate_tax', $order);
@@ -456,18 +455,8 @@ function uc_taxes_javascript() {
     if (is_array($subtotal) && !empty($taxes)) {
       $taxes['subtotal'] = array('id' => 'subtotal', 'name' => $subtotal[0]['title'], 'amount' => $subtotal[0]['amount'], 'weight' => -10);
     }
-    //drupal_set_message('<pre>'. print_r($taxes, TRUE) .'</pre>');
-    if (count($taxes)) {
-      print drupal_to_js((array)$taxes);
-    }
-    else {
-      print '{}';
-    }
-  }
-  else {
-    print '{}';
   }
-  exit();
+  drupal_json((array) $taxes);
 }
 
 /**