From ff9d14b17c820430be9ea42d743e0d10ce27f7cc Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Fri, 3 Apr 2009 19:26:07 +0000
Subject: [PATCH] fix for keyword control only initially showing a single
 keyword

---
 lib/WebGUI/Form/Codearea.pm          | 2 +-
 lib/WebGUI/Form/Control.pm           | 2 +-
 lib/WebGUI/Form/SubscriptionGroup.pm | 2 +-
 lib/WebGUI/Form/Text.pm              | 2 +-
 lib/WebGUI/Form/Textarea.pm          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm
index 00fad717e..88a33b661 100644
--- a/lib/WebGUI/Form/Codearea.pm
+++ b/lib/WebGUI/Form/Codearea.pm
@@ -137,7 +137,7 @@ sub toHtml {
 	my $output  = "";
     
     # Do our superclass's job
- 	my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->getOriginalValue)));
+    my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters(scalar $self->getOriginalValue)));
 	my $width = $self->get('width') || 400;
 	my $height = $self->get('height') || 150;
 	my ($style, $url) = $self->session->quick(qw(style url));
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index d16ac5e5f..b0b02d1a7 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -689,7 +689,7 @@ Renders the form field to HTML as a hidden field rather than whatever field type
 sub toHtmlAsHidden {
 	my $self = shift;
         return '<input type="hidden" name="'.$self->get("name").'" value="'.
-            $self->fixQuotes($self->fixMacros($self->fixSpecialCharacters($self->getOriginalValue()))).'" />'."\n";
+            $self->fixQuotes($self->fixMacros($self->fixSpecialCharacters(scalar $self->getOriginalValue()))).'" />'."\n";
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Form/SubscriptionGroup.pm b/lib/WebGUI/Form/SubscriptionGroup.pm
index b022664d9..a2e1d83ef 100644
--- a/lib/WebGUI/Form/SubscriptionGroup.pm
+++ b/lib/WebGUI/Form/SubscriptionGroup.pm
@@ -85,7 +85,7 @@ Renders the form field to HTML as a table row. The row is not displayed because
 
 sub toHtmlWithWrapper {
 	my $self         = shift;
-    my $value        = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters($self->getOriginalValue))) || '';
+    my $value        = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters(scalar $self->getOriginalValue))) || '';
     if ($value) {
         my $manageButton = $self->session->icon->manage("op=editGroup;gid=".$value);
         $self->set("subtext",$manageButton . $self->get("subtext"));
diff --git a/lib/WebGUI/Form/Text.pm b/lib/WebGUI/Form/Text.pm
index 90df2980f..35d582323 100644
--- a/lib/WebGUI/Form/Text.pm
+++ b/lib/WebGUI/Form/Text.pm
@@ -125,7 +125,7 @@ Renders an input tag of type text.
 
 sub toHtml {
 	my $self = shift;
- 	my $value = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters($self->getOriginalValue)));
+ 	my $value = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters(scalar $self->getOriginalValue)));
         return '<input id="'.$self->get('id').'" type="text" name="'.$self->get("name").'" value="'.$value.'" size="'.$self->get("size").'" maxlength="'.$self->get("maxlength").'" '.$self->get("extras").' />';
 }
 
diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm
index b09af83cc..a8cece02e 100644
--- a/lib/WebGUI/Form/Textarea.pm
+++ b/lib/WebGUI/Form/Textarea.pm
@@ -139,7 +139,7 @@ Renders an input tag of type text.
 
 sub toHtml {
 	my $self = shift;
- 	my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->getOriginalValue)));
+ 	my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters(scalar $self->getOriginalValue)));
 	my $width = $self->get('width') || 400;
 	my $height = $self->get('height') || 150;
 	my ($style, $url) = $self->session->quick(qw(style url));