Index: payment/uc_authorizenet/uc_authorizenet.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_authorizenet/uc_authorizenet.module,v
retrieving revision 1.3.2.12
diff -u -p -r1.3.2.12 uc_authorizenet.module
--- payment/uc_authorizenet/uc_authorizenet.module	18 Nov 2009 21:13:32 -0000	1.3.2.12
+++ payment/uc_authorizenet/uc_authorizenet.module	13 Mar 2010 06:08:07 -0000
@@ -127,7 +127,7 @@ function uc_authorizenet_settings_form()
   $form['aim_settings']['uc_authnet_aim_txn_mode'] = array(
     '#type' => 'radios',
     '#title' => t('Transaction mode'),
-    '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.<br/>Adjust to live transactions when you are ready to start processing real payments.'),
+    '#description' => t('Only specify a developer test account if you login to your account through https://test.authorize.net.<br />Adjust to live transactions when you are ready to start processing real payments.'),
     '#options' => array(
       'live' => t('Live transactions in a live account'),
       'live_test' => t('Test transactions in a live account'),
Index: payment/uc_payment/uc_payment.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_payment/uc_payment.module,v
retrieving revision 1.4.2.15
diff -u -p -r1.4.2.15 uc_payment.module
--- payment/uc_payment/uc_payment.module	16 Jan 2009 22:12:35 -0000	1.4.2.15
+++ payment/uc_payment/uc_payment.module	13 Mar 2010 06:08:08 -0000
@@ -326,7 +326,7 @@ function uc_payment_settings_overview() 
       t('Payment tracking is !status.', array('!status' => variable_get('uc_payment_tracking', TRUE) ? t('enabled') : t('disabled'))),
       t('Payments !status be deleted by approved users.', array('!status' => variable_get('uc_payment_deleting', TRUE) ? t('may') : t('may not'))),
       t('Payments are !status in the order logs.', array('!status' => variable_get('uc_payment_logging', TRUE) ? t('tracked') : t('not tracked'))),
-      t('Default payment details message:<br/>%message', array('%message' => variable_get('uc_default_payment_msg', t('Continue with checkout to complete payment.')))),
+      t('Default payment details message:<br />%message', array('%message' => variable_get('uc_default_payment_msg', t('Continue with checkout to complete payment.')))),
     ),
   );
 
Index: payment/uc_paypal/uc_paypal.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_paypal/uc_paypal.module,v
retrieving revision 1.4.2.16
diff -u -p -r1.4.2.16 uc_paypal.module
--- payment/uc_paypal/uc_paypal.module	18 Nov 2009 21:13:32 -0000	1.4.2.16
+++ payment/uc_paypal/uc_paypal.module	13 Mar 2010 06:08:10 -0000
@@ -154,7 +154,7 @@ function uc_paypal_payment_method() {
   $path = base_path() . drupal_get_path('module', 'uc_credit');
   $title1 = '<img src="https://www.paypal.com/en_US/i/logo/PayPal_mark_37x23.gif" style="position: relative; top: 5px; margin-right: 4px;">'
          . t('PayPal - pay without sharing your financial information.');
-  $title2 = '<br><span id="paypal-includes" style="padding-left: 5.5em;">'
+  $title2 = '<br /><span id="paypal-includes" style="padding-left: 5.5em;">'
           . t('<b>Includes:</b> ');
   $cc_types = array('visa', 'mastercard', 'discover', 'amex', 'echeck');
   foreach ($cc_types as $type) {
@@ -217,7 +217,7 @@ function uc_paypal_wpp_settings_form() {
   $form['paypal_wpp']['ec'] = array(
     '#type' => 'fieldset',
     '#title' => t('Express Checkout'),
-    '#description' => t('These settings are specifically for the alternate checkout system offered by Express Checkout.<br>To enable this on your site, you must enable the corresponding cart pane in the <em>Cart settings</em> menu.'),
+    '#description' => t('These settings are specifically for the alternate checkout system offered by Express Checkout.<br />To enable this on your site, you must enable the corresponding cart pane in the <em>Cart settings</em> menu.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -391,9 +391,9 @@ function uc_paypal_wpp_charge($order_id,
   if ($nvp_response['ACK'] != 'Success') {
     $message = t('<b>@type failed.</b><br /><b>@severity:</b> @error', array('@type' => $types[$data['txn_type']], '@severity' => $nvp_response['L_SEVERITYCODE0'], '@error' => $nvp_response['L_ERRORCODE0'] .'. '. $nvp_response['L_LONGMESSAGE0']));
     if ($data['txn_type'] != UC_CREDIT_PRIOR_AUTH_CAPTURE) {
-      $message .= '<br>'. t('<b>Address:</b> @avscode', array('@avscode' => _uc_paypal_avscode_message($nvp_response['AVSCODE'])));
+      $message .= '<br />'. t('<b>Address:</b> @avscode', array('@avscode' => _uc_paypal_avscode_message($nvp_response['AVSCODE'])));
       if (variable_get('uc_credit_cvv_enabled', TRUE)) {
-        $message .= '<br>'. t('<b>CVV2:</b> @cvvmatch', array('@cvvmatch' => _uc_paypal_cvvmatch_message($nvp_response['CVV2MATCH'])));
+        $message .= '<br />'. t('<b>CVV2:</b> @cvvmatch', array('@cvvmatch' => _uc_paypal_cvvmatch_message($nvp_response['CVV2MATCH'])));
       }
     }
     $result = array(
@@ -405,9 +405,9 @@ function uc_paypal_wpp_charge($order_id,
   else {
     $message = t('<b>@type</b><br /><b>Success: </b>@amount @currency', array('@type' => $types[$data['txn_type']], '@amount' => uc_currency_format($nvp_response['AMT'], FALSE), '@currency' => $nvp_response['CURRENCYCODE']));
     if ($data['txn_type'] != UC_CREDIT_PRIOR_AUTH_CAPTURE) {
-      $message .= '<br>'. t('<b>Address:</b> @avscode', array('@avscode' => _uc_paypal_avscode_message($nvp_response['AVSCODE'])));
+      $message .= '<br />'. t('<b>Address:</b> @avscode', array('@avscode' => _uc_paypal_avscode_message($nvp_response['AVSCODE'])));
       if (variable_get('uc_credit_cvv_enabled', TRUE)) {
-        $message .= '<br>'. t('<b>CVV2:</b> @cvvmatch', array('@cvvmatch' => _uc_paypal_cvvmatch_message($nvp_response['CVV2MATCH'])));
+        $message .= '<br />'. t('<b>CVV2:</b> @cvvmatch', array('@cvvmatch' => _uc_paypal_cvvmatch_message($nvp_response['CVV2MATCH'])));
       }
     }
     $result = array(
@@ -450,7 +450,7 @@ function uc_payment_method_paypal_wps($o
       if (empty($txn_id)) {
         $txn_id = t('Unknown');
       }
-      return t('Transaction ID:<br>@txn_id', array('@txn_id' => $txn_id));
+      return t('Transaction ID:<br />@txn_id', array('@txn_id' => $txn_id));
 
     case 'settings':
       $form['uc_paypal_wps_email'] = array(
@@ -485,7 +485,7 @@ function uc_payment_method_paypal_wps($o
       $form['uc_paypal_wps_payment_action'] = array(
         '#type' => 'select',
         '#title' => t('Payment action'),
-        '#description' => t('"Complete sale" will authorize and capture the funds at the time the payment is processed.<br>"Authorization" will only reserve funds on the card to be captured later through your PayPal account.'),
+        '#description' => t('"Complete sale" will authorize and capture the funds at the time the payment is processed.<br />"Authorization" will only reserve funds on the card to be captured later through your PayPal account.'),
         '#options' => array(
           'Sale' => t('Complete sale'),
           'Authorization' => t('Authorization'),
@@ -551,7 +551,7 @@ function uc_payment_method_paypal_ec($op
       if (empty($txn_id)) {
         $txn_id = t('Unknown');
       }
-      return t('Transaction ID:<br>@txn_id', array('@txn_id' => $txn_id));
+      return t('Transaction ID:<br />@txn_id', array('@txn_id' => $txn_id));
 
     case 'settings':
       $form['redirect'] = array(
@@ -904,7 +904,7 @@ function uc_paypal_ec_checkout($form_id,
   $nvp_response = uc_paypal_api_request($nvp_request, variable_get('uc_paypal_wpp_server', 'https://api-3t.sandbox.paypal.com/nvp'));
 
   if ($nvp_response['ACK'] != 'Success') {
-    drupal_set_message(t('Error message from PayPal:<br>@message', array('@message' => $nvp_response['L_LONGMESSAGE0'])), 'error');
+    drupal_set_message(t('Error message from PayPal:<br />@message', array('@message' => $nvp_response['L_LONGMESSAGE0'])), 'error');
     drupal_goto('cart/checkout');
   }
 
Index: payment/uc_recurring/uc_recurring.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/payment/uc_recurring/Attic/uc_recurring.module,v
retrieving revision 1.8.2.6
diff -u -p -r1.8.2.6 uc_recurring.module
--- payment/uc_recurring/uc_recurring.module	23 Sep 2009 19:14:41 -0000	1.8.2.6
+++ payment/uc_recurring/uc_recurring.module	13 Mar 2010 06:08:11 -0000
@@ -532,7 +532,7 @@ function uc_recurring_settings_form() {
   $form['uc_recurring_payment_methods'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Valid payment methods for orders with recurring fees'),
-    '#description' => t('Only selected payment methods will be available for customers purchasing products with recurring fees.<br/>It is up to you to make sure your chosen handler is compatible with the payment methods you select.<br />For example, the uc_recurring handler is only compatible with the Credit Card payment method.'),
+    '#description' => t('Only selected payment methods will be available for customers purchasing products with recurring fees.<br />It is up to you to make sure your chosen handler is compatible with the payment methods you select.<br />For example, the uc_recurring handler is only compatible with the Credit Card payment method.'),
     '#options' => $options,
     '#default_value' => variable_get('uc_recurring_payment_methods', array()),
   );
@@ -551,7 +551,7 @@ function uc_recurring_settings_form() {
   $form['uc_recurring_checkout_fail'] = array(
     '#type' => 'radios',
     '#title' => t('Action to take if a recurring fee fails to process during checkout'),
-    '#description' => t('Regardless of your selection, an admin comment will report the failure.<br/><strong>Note:</strong> Even if you select the first option, checkout will complete if another payment has already been captured.'),
+    '#description' => t('Regardless of your selection, an admin comment will report the failure.<br /><strong>Note:</strong> Even if you select the first option, checkout will complete if another payment has already been captured.'),
     '#options' => array(
       'fail' => t('Return a failed message and do not complete checkout.'),
       'proceed' => t('Return a failed message but complete checkout.'),
Index: shipping/uc_ups/uc_ups.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/shipping/uc_ups/uc_ups.module,v
retrieving revision 1.4.2.14
diff -u -p -r1.4.2.14 uc_ups.module
--- shipping/uc_ups/uc_ups.module	23 Sep 2009 19:14:41 -0000	1.4.2.14
+++ shipping/uc_ups/uc_ups.module	13 Mar 2010 06:08:15 -0000
@@ -1383,13 +1383,13 @@ View/Print Label</title></head><style>
 <table border="0" cellpadding="0" cellspacing="0" width="600"><tr>
 <td height="410" align="left" valign="top">
 <b class="large_text">View/Print Label</b>
-&nbsp;<br>
+&nbsp;<br />
 <ol class="small_text"> <li><b>Print the label:</b> &nbsp;
-Select Print from the File menu in this browser window to print the label below.<br><br><li><b>
+Select Print from the File menu in this browser window to print the label below.<br /><br /><li><b>
 Fold the printed label at the dotted line.</b> &nbsp;
-Place the label in a UPS Shipping Pouch. If you do not have a pouch, affix the folded label using clear plastic shipping tape over the entire label.<br><br><li><b>GETTING YOUR SHIPMENT TO UPS<br>
+Place the label in a UPS Shipping Pouch. If you do not have a pouch, affix the folded label using clear plastic shipping tape over the entire label.<br /><br /><li><b>GETTING YOUR SHIPMENT TO UPS<br />
 Customers without a Daily Pickup</b><ul><li>Ground, 3 Day Select, and Standard to Canada shipments must be dropped off at an authorized UPS location, or handed to a UPS driver. Pickup service is not available for these services. To find the nearest drop-off location, select the Drop-off icon from the UPS tool bar.<li>
-Air shipments (including Worldwide Express and Expedited) can be picked up or dropped off. To schedule a pickup, or to find a drop-off location, select the Pickup or Drop-off icon from the UPS tool bar.  </ul> <br>
+Air shipments (including Worldwide Express and Expedited) can be picked up or dropped off. To schedule a pickup, or to find a drop-off location, select the Pickup or Drop-off icon from the UPS tool bar.  </ul> <br />
 <b>Customers with a Daily Pickup</b><ul><li>
 Your driver will pickup your shipment(s) as usual. </ul>
 </ol></td></tr></table><table border="0" cellpadding="0" cellspacing="0" width="600">
@@ -1399,7 +1399,7 @@ Your driver will pickup your shipment(s)
 FOLD HERE</td>
 </tr>
 <tr>
-<td align="left" valign="top"><hr>
+<td align="left" valign="top"><hr />
 </td>
 </tr>
 </table>
Index: uc_catalog/uc_catalog.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_catalog/uc_catalog.module,v
retrieving revision 1.14.2.17
diff -u -p -r1.14.2.17 uc_catalog.module
--- uc_catalog/uc_catalog.module	23 Sep 2009 19:14:42 -0000	1.14.2.17
+++ uc_catalog/uc_catalog.module	13 Mar 2010 06:08:18 -0000
@@ -858,7 +858,7 @@ function theme_uc_catalog_browse($tid = 
     if ($child->nodes) {
       $cell_link = $image .'<strong>'. l($child->name, uc_catalog_path($child)) .'</strong>';
       if (variable_get('uc_catalog_show_subcategories', true)) {
-        $cell_link .= "<br/><span>". implode(', ', $grandchildren) ."</span>\n";
+        $cell_link .= "<br /><span>". implode(', ', $grandchildren) ."</span>\n";
       }
       $child_list[] = $cell_link;
     }
Index: uc_file/uc_file.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_file/uc_file.module,v
retrieving revision 1.1.2.16
diff -u -p -r1.1.2.16 uc_file.module
--- uc_file/uc_file.module	23 Sep 2009 19:14:42 -0000	1.1.2.16
+++ uc_file/uc_file.module	13 Mar 2010 06:08:21 -0000
@@ -404,12 +404,12 @@ function uc_file_feature_form_submit($fo
   global $user;
   $fid = db_result(db_query("SELECT fid FROM {uc_files} WHERE filename = '%s'", $form_values['uc_file_filename']));
   //Build product feature descriptions
-  $description = (empty($form_values['uc_file_model'])) ? t('<strong>SKU:</strong> Any<br/>') : t('<strong>SKU:</strong> !sku<br/>', array('!sku' => $form_values['uc_file_model']));
+  $description = (empty($form_values['uc_file_model'])) ? t('<strong>SKU:</strong> Any<br />') : t('<strong>SKU:</strong> !sku<br />', array('!sku' => $form_values['uc_file_model']));
   if (is_dir(variable_get('uc_file_base_dir', NULL) ."/". $form_values['uc_file_filename'])) {
-    $description .= t('<strong>Directory:</strong> !dir<br/>', array('!dir' => $form_values['uc_file_filename']));
+    $description .= t('<strong>Directory:</strong> !dir<br />', array('!dir' => $form_values['uc_file_filename']));
   }
   else {
-    $description .= t('<strong>File:</strong> !file<br/>', array('!file' => basename($form_values['uc_file_filename'])));;
+    $description .= t('<strong>File:</strong> !file<br />', array('!file' => basename($form_values['uc_file_filename'])));;
   }
   $shippable = ($form_values['uc_file_shippable']) ? 1 : 0;
   $description .= ($shippable) ? t('<strong>Shippable:</strong> Yes') : t('<strong>Shippable:</strong> No');
@@ -984,7 +984,7 @@ function _email_file_download($user, $or
   $body = token_replace_multiple(variable_get('uc_file_download_notification_message', uc_get_message('uc_file_download_message')), $token_filters);
   $body = check_markup($body, variable_get('uc_file_download_notification_format', 3), FALSE);
 
-  //drupal_set_message("Mail Sent<br/>key: $key, <br/>to: $to, <br/>subject: $subject, <br/>body: $body, <br/>from: $from, <br/>");
+  //drupal_set_message("Mail Sent<br />key: $key, <br />to: $to, <br />subject: $subject, <br />body: $body, <br />from: $from, <br />");
   return drupal_mail($key, $to, $subject, $body, $from, array('Content-Type' => 'text/html; charset=UTF-8; format=flowed'));
 }
 
Index: uc_order/uc_order.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/uc_order.module,v
retrieving revision 1.11.2.20
diff -u -p -r1.11.2.20 uc_order.module
--- uc_order/uc_order.module	22 Feb 2010 06:48:55 -0000	1.11.2.20
+++ uc_order/uc_order.module	13 Mar 2010 06:08:27 -0000
@@ -1367,7 +1367,7 @@ function uc_order_search_form() {
   $form['search']['table1'] = array('#value' => '<table><tbody style="border: 0em;"><tr><td colspan="4">');
 
   $form['search']['desc'] = array(
-    '#value' => '<div>'. t("Search for customers based on any of the following fields.  Use * as a wildcard to match any character.<br/>For example, searching by last name for 's*' will return all customers whose last name starts with an s.<br/>(<em>Leave a field empty to ignore it in the search.</em>)") .'</div>',
+    '#value' => '<div>'. t("Search for customers based on any of the following fields.  Use * as a wildcard to match any character.<br />For example, searching by last name for 's*' will return all customers whose last name starts with an s.<br />(<em>Leave a field empty to ignore it in the search.</em>)") .'</div>',
   );
 
   $form['search']['table2'] = array('#value' => '</td></tr><tr><td>');
@@ -2173,10 +2173,10 @@ function uc_order_address_book_form($uid
   $select = uc_select_address($uid, $type, $func);
 
   if ($uid == 0) {
-    $form['desc'] = array('#value' => '<br>'. t('You must select a customer before address<br>information is available.<br>') .'<br>');
+    $form['desc'] = array('#value' => '<br />'. t('You must select a customer before address<br />information is available.<br />') .'<br />');
   }
   elseif (is_null($select)) {
-    $form['desc'] = array('#value' => '<br>'. t('No addresses found for customer.') .'<br>');
+    $form['desc'] = array('#value' => '<br />'. t('No addresses found for customer.') .'<br />');
   }
   else {
     $form['addresses'] = uc_select_address($uid, $type, $func, t('Select an address'));
@@ -2252,7 +2252,7 @@ function uc_order_select_customer($email
       $output .= '<b>'. t('Use this account now?') .'</b><br />'
                . t('User !uid - !mail', array('!uid' => $user->uid, '!mail' => $user->mail)) .' <input type="button" '
                 .'onclick="select_existing_customer('. $user->uid .', \''
-               . $user->mail .'\');" value="'. t('Apply') .'" /><br /><br /><hr><br/>';
+               . $user->mail .'\');" value="'. t('Apply') .'" /><br /><br /><hr /><br />';
     }
     else {
       $data = array(
@@ -2268,12 +2268,12 @@ function uc_order_select_customer($email
         $subject = _user_mail_text('welcome_subject', $variables);
         $body = _user_mail_text('welcome_body', $variables);
         drupal_mail('user-register-welcome', $user->mail, $subject, $body, $from);
-        $output .= t('Account details sent to e-mail provided.<br><br><strong>Username:</strong> !username<br><strong>Password:</strong> !password', array('!username' => $user->name, '!password' => $data['pass'])) .'<br/><br/>';
+        $output .= t('Account details sent to e-mail provided.<br /><br /><strong>Username:</strong> !username<br /><strong>Password:</strong> !password', array('!username' => $user->name, '!password' => $data['pass'])) .'<br /><br />';
       }
       $output .= '<strong>'. t('Use this account now?') .'</strong><br />'
                . t('User !uid - !mail', array('!uid' => $user->uid, '!mail' => $user->mail)) .' <input type="button" '
                 .'onclick="select_existing_customer('. $user->uid .', \''
-               . $user->mail .'\');" value="'. t('Apply') .'" /><br /><br /><hr><br/>';
+               . $user->mail .'\');" value="'. t('Apply') .'" /><br /><br /><hr /><br />';
     }
   }
 
@@ -2287,7 +2287,7 @@ function uc_order_select_customer_form($
   if (is_null(arg(4))) {
     $form['desc'] = array(
       '#value' => '<div>'. t('Search for a customer based on these fields.')
-                 .'<br />'. t('Use * as a wildcard to match any character.') .'<br/>'
+                 .'<br />'. t('Use * as a wildcard to match any character.') .'<br />'
                  .'(<em>'. t('Leave a field empty to ignore it in the search.')
                  .'</em>)</div>',
     );
Index: uc_order/templates/customer.itpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/templates/customer.itpl.php,v
retrieving revision 1.4.2.5
diff -u -p -r1.4.2.5 customer.itpl.php
--- uc_order/templates/customer.itpl.php	23 Sep 2009 19:14:42 -0000	1.4.2.5
+++ uc_order/templates/customer.itpl.php	13 Mar 2010 06:08:28 -0000
@@ -20,7 +20,7 @@
                 </td>
                 <td width="98%">
                   <div style="padding-left: 1em;">
-                  <span style="font-size: large;">[store-name]</span><br/>
+                  <span style="font-size: large;">[store-name]</span><br />
                   [site-slogan]
                   </div>
                 </td>
@@ -41,7 +41,7 @@
 
             <?php if (isset($_SESSION['new_user'])) { ?>
             <p><b><?php echo t('An account has been created for you with the following details:'); ?></b></p>
-            <p><b><?php echo t('Username:'); ?></b> [new-username]<br/>
+            <p><b><?php echo t('Username:'); ?></b> [new-username]<br />
             <b><?php echo t('Password:'); ?></b> [new-password]</p>
             <?php } ?>
 
Index: uc_repeater/uc_repeater.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_repeater/Attic/uc_repeater.module,v
retrieving revision 1.4.2.5
diff -u -p -r1.4.2.5 uc_repeater.module
--- uc_repeater/uc_repeater.module	29 Jul 2008 22:22:45 -0000	1.4.2.5
+++ uc_repeater/uc_repeater.module	13 Mar 2010 06:08:28 -0000
@@ -150,7 +150,7 @@ function uc_repeater_export($nids = arra
       $responses = array();
       foreach (variable_get('uc_repeater_slaves', array()) as $site) {
         $responses[$site] = drupal_http_request('http://'. $site .'/repeater/import/'. md5($_SERVER['SERVER_NAME'] . substr(base_path(), 0, -1)) .'/'. md5($xml), array('Content-Type' => 'text/xml'), 'POST', $xml);
-        //watchdog('uc_repeater', htmlentities($xml) ."<br/>$site:<pre>". print_r($responses[$site], true) ."</pre>", WATCHDOG_NOTICE);
+        //watchdog('uc_repeater', htmlentities($xml) ."<br />$site:<pre>". print_r($responses[$site], true) ."</pre>", WATCHDOG_NOTICE);
       }
     }
   }
Index: uc_reports/uc_reports.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_reports/uc_reports.module,v
retrieving revision 1.11.4.7
diff -u -p -r1.11.4.7 uc_reports.module
--- uc_reports/uc_reports.module	12 Mar 2010 17:51:47 -0000	1.11.4.7
+++ uc_reports/uc_reports.module	13 Mar 2010 06:08:30 -0000
@@ -583,13 +583,13 @@ function uc_reports_products_custom() {
         $sold = db_result(db_query("SELECT SUM(qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN $order_statuses AND p.model = '%s' AND p.nid = %d AND $time_condition", $model, $product['nid']));
         $revenue = db_result(db_query("SELECT SUM(p.price * p.qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN $order_statuses AND p.model = '%s' AND p.nid = %d AND $time_condition", $model, $product['nid']));
         $gross = db_result(db_query("SELECT (SUM(p.price * p.qty) - SUM(p.cost * p.qty)) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN $order_statuses AND p.model = '%s' AND p.nid = %d AND $time_condition", $model, $product['nid']));
-        $breakdown_product .= "<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$model";
+        $breakdown_product .= "<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$model";
         $product_csv .= "\n     $model";
-        $breakdown_sold .= "<br/>". ((!empty($sold)) ? $sold : 0);
+        $breakdown_sold .= "<br />". ((!empty($sold)) ? $sold : 0);
         $sold_csv .= "\n     ". ((!empty($sold)) ? $sold : 0);
-        $breakdown_revenue .= "<br/>". (uc_currency_format((!empty($revenue)) ? $revenue : 0));
+        $breakdown_revenue .= "<br />". (uc_currency_format((!empty($revenue)) ? $revenue : 0));
         $revenue_csv .= "\n     ". (uc_currency_format((!empty($revenue)) ? $revenue : 0));
-        $breakdown_gross .= "<br/>". (uc_currency_format((!empty($gross)) ? $gross : 0));
+        $breakdown_gross .= "<br />". (uc_currency_format((!empty($gross)) ? $gross : 0));
         $gross_csv .= "\n     ". (uc_currency_format((!empty($gross)) ? $gross : 0));
       }
       $product_cell = $product_cell . $breakdown_product;
@@ -1044,7 +1044,7 @@ function uc_reports_sales_custom() {
       // Grab the detailed product breakdown if selected.
       $result = db_query("SELECT SUM(op.qty) as count, n.title, n.nid FROM {uc_order_products} as op LEFT JOIN {uc_orders} as o ON o.order_id = op.order_id LEFT JOIN {node} as n ON n.nid = op.nid WHERE %d <= o.created AND o.created <= %d AND o.order_status IN $order_statuses GROUP BY n.nid ORDER BY count DESC, n.title ASC", $subreport['start'], $subreport['end']);
       while ($product_breakdown = db_fetch_object($result)) {
-        $product_data .= $product_breakdown->count .' x '. l($product_breakdown->title, 'node/'. $product_breakdown->nid) ."<br/>\n";
+        $product_data .= $product_breakdown->count .' x '. l($product_breakdown->title, 'node/'. $product_breakdown->nid) ."<br />\n";
         $product_csv .= $product_breakdown->count .' x '. $product_breakdown->title ."\n";
       }
     }
Index: uc_roles/uc_roles.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_roles/uc_roles.module,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 uc_roles.module
--- uc_roles/uc_roles.module	23 Sep 2009 19:14:43 -0000	1.1.2.14
+++ uc_roles/uc_roles.module	13 Mar 2010 06:08:33 -0000
@@ -193,12 +193,12 @@ function uc_roles_user($op, &$edit, &$ac
             $form['account']['expirations']['role_'. $expiration->rid .'_granularity']['#suffix'] .= '</tr>';
             $form['account']['expirations']['role_'. $expiration->rid .'_expiration'] = array('#type' => 'value', '#value' => $expiration->expiration);
           }
-          $form['account']['expirations']['table_end'] = array('#type' => 'markup', '#value' => '</tbody></table><br/>');
+          $form['account']['expirations']['table_end'] = array('#type' => 'markup', '#value' => '</tbody></table><br />');
         }
         else { //There are no expirations to administer
           $form['account']['expirations']['no_expirations'] = array(
             '#type' => 'markup',
-            '#value' => '<table><thead><th>'. t('Role') .'</th><th>'. t('Expiration') .'</th><th>'. t('Operation') .'</th></thead><tbody><tr><td colspan="3">'. t('There are no pending expirations for roles this user.') .'</td></tr></tbody></table><br/>',
+            '#value' => '<table><thead><th>'. t('Role') .'</th><th>'. t('Expiration') .'</th><th>'. t('Operation') .'</th></thead><tbody><tr><td colspan="3">'. t('There are no pending expirations for roles this user.') .'</td></tr></tbody></table><br />',
           );
         }
 
@@ -655,28 +655,28 @@ function uc_roles_feature_form_validate(
   }
 }
 function uc_roles_feature_form_submit($form_id, $form_values) {
-  $description = (empty($form_values['uc_roles_model'])) ? t('<strong>SKU:</strong> Any<br/>') : t('<strong>SKU:</strong> !sku<br/>', array('!sku' => $form_values['uc_roles_model']));
-  $description .=  t('<strong>Role:</strong> !role_name<br/>', array('!role_name' => _get_role_name($form_values['uc_roles_role'])));
+  $description = (empty($form_values['uc_roles_model'])) ? t('<strong>SKU:</strong> Any<br />') : t('<strong>SKU:</strong> !sku<br />', array('!sku' => $form_values['uc_roles_model']));
+  $description .=  t('<strong>Role:</strong> !role_name<br />', array('!role_name' => _get_role_name($form_values['uc_roles_role'])));
   switch ($form_values['uc_roles_granularity']) {
     case 'never':
-      $description .= t('<strong>Expiration:</strong> never<br/>');
+      $description .= t('<strong>Expiration:</strong> never<br />');
       break;
     case 'day':
-      $description .= t('<strong>Expiration:</strong> !qty day(s)<br/>', array('!qty' => $form_values['uc_roles_qty']));
+      $description .= t('<strong>Expiration:</strong> !qty day(s)<br />', array('!qty' => $form_values['uc_roles_qty']));
       break;
     case 'week':
-      $description .= t('<strong>Expiration:</strong> !qty week(s)<br/>', array('!qty' => $form_values['uc_roles_qty']));
+      $description .= t('<strong>Expiration:</strong> !qty week(s)<br />', array('!qty' => $form_values['uc_roles_qty']));
       break;
     case 'month':
-      $description .= t('<strong>Expiration:</strong> !qty month(s)<br/>', array('!qty' => $form_values['uc_roles_qty']));
+      $description .= t('<strong>Expiration:</strong> !qty month(s)<br />', array('!qty' => $form_values['uc_roles_qty']));
       break;
     case 'year':
-      $description .= t('<strong>Expiration:</strong> !qty year(s)<br/>', array('!qty' => $form_values['uc_roles_qty']));
+      $description .= t('<strong>Expiration:</strong> !qty year(s)<br />', array('!qty' => $form_values['uc_roles_qty']));
       break;
     default:
       break;
   }
-  $description .= ($form_values['uc_roles_shippable']) ? t('<strong>Shippable:</strong> Yes<br/>') : t('<strong>Shippable:</strong> No<br/>');
+  $description .= ($form_values['uc_roles_shippable']) ? t('<strong>Shippable:</strong> Yes<br />') : t('<strong>Shippable:</strong> No<br />');
   $shippable = ($form_values['uc_roles_shippable']) ? 1 : 0;
   $description .= ($form_values['uc_roles_by_quantity']) ? t('<strong>Multiply by Quantity:</strong> Yes') : t('<strong>Multiply by Quantity:</strong> No');
   $by_quantity = ($form_values['uc_roles_by_quantity']) ? 1 : 0;
@@ -1010,7 +1010,7 @@ function _role_email_user($status, $user
   $subject = token_replace_multiple($subject, $token_filters);
   $body = token_replace_multiple($body, $token_filters);
 
-  //drupal_set_message("Mail Sent<br/>key: $key, <br/>to: $to, <br/>subject: $subject, <br/>body: $body, <br/>from: $from, <br/>");
+  //drupal_set_message("Mail Sent<br />key: $key, <br />to: $to, <br />subject: $subject, <br />body: $body, <br />from: $from, <br />");
   return drupal_mail($key, $to, $subject, $body, $from, uc_notify_headers());
 }
 
Index: uc_store/uc_store.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/uc_store.module,v
retrieving revision 1.13.2.17
diff -u -p -r1.13.2.17 uc_store.module
--- uc_store/uc_store.module	23 Sep 2009 19:14:43 -0000	1.13.2.17
+++ uc_store/uc_store.module	13 Mar 2010 06:08:37 -0000
@@ -859,7 +859,7 @@ function uc_store_customer_search_form()
   $form['search']['table1'] = array('#value' => '<table><tbody style="border: 0px;"><tr><td colspan="4">');
 
   $form['search']['desc'] = array(
-    '#value' => '<div>'. t("Search for customers based on any of the following fields.  Use * as a wildcard to match any character.<br/>For example, searching by last name for 's*' will return all customers whose last name starts with an s.<br/>(<em>Leave a field empty to ignore it in the search.</em>)"). '</div>',
+    '#value' => '<div>'. t("Search for customers based on any of the following fields.  Use * as a wildcard to match any character.<br />For example, searching by last name for 's*' will return all customers whose last name starts with an s.<br />(<em>Leave a field empty to ignore it in the search.</em>)"). '</div>',
   );
 
   $form['search']['table2'] = array('#value' => '</td></tr><tr><td>');
@@ -1245,7 +1245,7 @@ function uc_country_formats_form() {
   );
   $form['instructions']['text'] = array(
     '#value' => '<div>'. t('The following variables should be used in configuring addresses for the countries you ship to:') .'<p>'
-              . theme('table', $header, $rows) .'</p><p>'. t('*Adding _if to any country variable will make it only display for addresses<br>whose country is different than the default store country.') .'</div>',
+              . theme('table', $header, $rows) .'</p><p>'. t('*Adding _if to any country variable will make it only display for addresses<br />whose country is different than the default store country.') .'</div>',
   );
 
   $result = db_query("SELECT * FROM {uc_countries} ORDER BY country_name ASC");
@@ -1329,7 +1329,7 @@ function uc_store_store_settings_overvie
     'edit' => 'admin/store/settings/store/edit/display',
     'title' => t('Display settings'),
     'items' => array(
-      t('Store admin page display type:<br>!type', array('!type' => $type)),
+      t('Store admin page display type:<br />!type', array('!type' => $type)),
       t('Customer !type address used in lists.', array('!type' => variable_get('uc_customer_list_address', 'billing') == 'billing' ? t('billing') : t('shipping'))),
       t('Footer using !type message.', array('!type' => variable_get('uc_footer_message', 0) == 0 ? t('random') : t('specified'))),
     ),
@@ -2004,7 +2004,7 @@ function uc_address_format($first_name, 
   }
 
   $variables = array(
-    "\r\n" => '<br>',
+    "\r\n" => '<br />',
     '!company' => check_plain($company),
     '!first_name' => check_plain($first_name),
     '!last_name' => check_plain($last_name),
@@ -2035,10 +2035,10 @@ function uc_address_format($first_name, 
     $format = "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if";
   }
   $address = strtr($format, $variables);
-  $address = strtr($address, array("\n" => '<br>'));
+  $address = strtr($address, array("\n" => '<br />'));
 
-  $match = array('/^<br>/', '/<br>$/', '/<br>(\s*|[\s*<br>\s*]+)<br>/', '/<br><br>/', '`<br>, N/A`');
-  $replace = array('', '', '<br>', '<br>', '', '');
+  $match = array('/^<br />/', '/<br />$/', '/<br />(\s*|[\s*<br />\s*]+)<br />/', '/<br /><br />/', '`<br />, N/A`');
+  $replace = array('', '', '<br />', '<br />', '', '');
   $address = preg_replace($match, $replace, $address);
 
   return $address;