preparing for 6.2.4 bugfix cycle

docs/changelog/6.x.x.txt

@@ -1,3 +1,8 @@
+6.2.4
+ - Changed text processor to convert HTML tags into text rather than
+   discarding them.
+
+
 6.2.3
  - Changed to new POD format.
  - Fixed GUID related bugs in search indexer and passive profiling.

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "6.2.3";
+our $VERSION = "6.2.4";
 our $STATUS = "beta";
 
 #-------------------------------------------------------------------

lib/WebGUI/HTML.pm

@@ -156,19 +156,20 @@ The content type to use as formatting. Valid types are 'html', 'text', 'code', a
 sub format {
 	my ($content, $contentType) = @_;
 	$contentType = 'mixed' unless ($contentType);
-	if ($contentType eq "mixed") {
+	if ($contentType eq "text" || $contentType eq "code") {
-                unless ($content =~ /\<div/ig || $content =~ /\<br/ig || $content =~ /\<p/ig) {
-                        $content =~ s/\n/\<br \/\>/g;
-                }
-        } elsif ($contentType eq "text") {
-                $content =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
-                $content =~ s/\n/\<br \/\>/g;
-        } elsif ($contentType eq "code") {
                 $content =~ s/&/&amp;/g;
                 $content =~ s/\</&lt;/g;
                 $content =~ s/\>/&gt;/g;
                 $content =~ s/\n/\<br \/\>/g;
                 $content =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
+	}
+	if ($contentType eq "mixed") {
+                unless ($content =~ /\<div/ig || $content =~ /\<br/ig || $content =~ /\<p/ig) {
+                        $content =~ s/\n/\<br \/\>/g;
+                }
+        } elsif ($contentType eq "text") {
+                $content =~ s/  / &nbsp;/g;
+        } elsif ($contentType eq "code") {
                 $content =~ s/ /&nbsp;/g;
                 $content = '<div style="font-family: monospace;">'.$content.'</div>';
         }