[otrs-cvs] Survey/Kernel/Modules PublicSurvey.pm,1.30,1.30.2.1

Comments:
Update of /home/cvs/Survey/Kernel/Modules
In directory lancelot:/tmp/cvs-serv5128/Kernel/Modules

Modified Files:
      Tag: rel-2_1
	PublicSurvey.pm 
Log Message:
Fixed bug#8940 thanx to Shwan.

Author: jh

Index: PublicSurvey.pm
===================================================================
RCS file: /home/cvs/Survey/Kernel/Modules/PublicSurvey.pm,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -2 -u -d -r1.30 -r1.30.2.1
--- PublicSurvey.pm	21 Nov 2012 14:42:09 -0000	1.30
+++ PublicSurvey.pm	23 Nov 2012 13:35:59 -0000	1.30.2.1
@@ -292,11 +292,10 @@
         if ( $Survey{Introduction} ) {
             $Survey{Introduction} =~ s{\A\$html\/text\$\s(.*)}{$1}xms;
-            $Survey{Introduction} = $Self->{LayoutObject}->Ascii2Html(
-                Text           => $Survey{Introduction},
-                HTMLResultMode => 1,
-            );
-            if ($1) {
-                $Survey{Introduction} =
-                    $Self->{HTMLUtilsObject}->ToAscii( String => $Survey{Introduction} );
+            my $HTMLContent = $1;
+            if ( !$HTMLContent ) {
+                $Survey{Introduction} = $Self->{LayoutObject}->Ascii2Html(
+                    Text           => $Survey{Introduction},
+                    HTMLResultMode => 1,
+                );
             }
         }
@@ -426,13 +425,11 @@
         $Survey{Introduction} =~ s{\A\$html\/text\$\s(.*)}{$1}xms;
         my $HTMLContent = $1;
-        $Survey{Introduction} = $Self->{LayoutObject}->Ascii2Html(
-            Text           => $Survey{Introduction},
-            HTMLResultMode => 1,
-        );
-
-        if ($HTMLContent) {
-            $Survey{Introduction}
-                = $Self->{HTMLUtilsObject}->ToAscii( String => $Survey{Introduction} );
+        if ( !$HTMLContent ) {
+            $Survey{Introduction} = $Self->{LayoutObject}->Ascii2Html(
+                Text           => $Survey{Introduction},
+                HTMLResultMode => 1,
+            );
         }
+
         $Self->{LayoutObject}->Block(
             Name => 'PublicSurvey',
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log