merging 6.8.5 bugfixes

docs/changelog/6.x.x.txt

@@ -10,6 +10,7 @@
 		   the patch)
  - fix [ 1404485 ] userDefined1 to 5 onlineHelp
  - fix [ 1403155 ] Poll shows no result
+ - fix [ 1373583 ] ITransact Module does not URL encode data within XML
 
 6.8.4
  - fix [ 1395371 ] XSS Vulnerability in DataForm Entries

lib/WebGUI/Commerce/Payment/ITransact.pm

@@ -586,7 +586,7 @@ sub normalTransaction {
 		$self->{_recurring} = 0;
 		$self->{_transactionParams} = {
 			AMT		=> sprintf('%.2f', $normal->{amount}),
-			DESCRIPTION	=> $normal->{description} || $i18n->get('no description'),
+			DESCRIPTION	=> WebGUI::URL::escape($normal->{description}) || $i18n->get('no description'),
 			INVOICENUMBER	=> $normal->{invoiceNumber},
 			ORGID		=> $normal->{id},
 		};
@@ -614,7 +614,7 @@ sub recurringTransaction {
 			INITIALAMT	=> sprintf('%.2f', $initialAmount),
 			TERM		=> $recurring->{term} || 9999,
 			RECIPE		=> _resolveRecipe($recurring->{payPeriod}),
-			DESCRIPTION	=> $recurring->{description} || $i18n->get('no description'),
+			DESCRIPTION	=> WebGUI::URL::escape($recurring->{description}) || $i18n->get('no description'),
 			INVOICENUMBER	=> $recurring->{invoiceNumber},
 			ORGID		=> $recurring->{id},
 		};