Fixing hash and object escaping

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1563 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 5 insertions, 5 deletions

diff --git a/LedgerSMB/Template/CSV.pm b/LedgerSMB/Template/CSV.pm
index 42324a89..cb861e93 100755
--- a/LedgerSMB/Template/CSV.pm
+++ b/LedgerSMB/Template/CSV.pm
@@ -58,11 +58,7 @@ sub preprocess {
 		for (@{$rawvars}) {
 			push @{$vars}, preprocess( $_ );
 		}
-	} elsif ( $type eq 'HASH' ) {
-		for ( keys %{$rawvars} ) {
-			$vars->{preprocess($_)} = preprocess( $rawvars->{$_} );
-		}
-	} else {
+	} elsif ( !$type ) { # Scalar
 		$vars = $rawvars;
 		$vars =~ s/\ / /;
 		$vars =~ s/(\t\n\r )+/ /g;
@@ -71,6 +67,10 @@ sub preprocess {
 		$vars =~ s/<.*?>//g;
 		$vars = qq|"$vars"| if $vars !~ /^\w+$/;
 		$vars = '' if $vars =~ /^""$/;
+	} else { # hashes and objects
+		for ( keys %{$rawvars} ) {
+			$vars->{preprocess($_)} = preprocess( $rawvars->{$_} );
+		}
 	}
 	return $vars;
 }