Merge branch 'FUP' into 'master'

FUP updates

See merge request !427

lib/smradius/attributes.pm

@@ -843,16 +843,16 @@ sub processConditional
 		$res = 1;
 	}
 
-	# Sanitize the output
-	$attribStr =~ s/^\s*//;
-	$attribStr =~ s/\s*$//;
-
 	$server->log(LOG_DEBUG,"[ATTRIBUTES] - Evaluated to '$res' returning '".(defined($attribStr) ? $attribStr : "-undef-")."'");
 
 	# Loop with attributes:
 	# We only get here if $res is set to 1 above, if its only a conditional with no onTrue & onFalse
 	# Then attribStr will be unef
 	if ($res && defined($attribStr)) {
+		# Sanitize the output
+		$attribStr =~ s/^\s*//;
+		$attribStr =~ s/\s*$//;
+
 		foreach my $rawAttr (split(/;/,$attribStr)) {
 			# Split off attribute string:  name = value
 			my ($attrName,$attrVal) = ($rawAttr =~ /^\s*([^=]+)=\s*(.*)/);