From 5127a307b7e0fa274fc8825a481ca0ebf9ad940c Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Tue, 2 Dec 2008 16:03:23 +0000
Subject: [PATCH] Minor fix.  JSON no longer assumes proper utf8, but uses
 whatever off-brand locale a luser wants to use.

---
 lib/WebGUI/Asset/Wobject/Survey.pm              | 10 +++++-----
 lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm |  4 ++--
 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index f1dc1a6e3..e973abc11 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -277,7 +277,7 @@ sub www_submitObjectEdit {
     return $self->session->privilege->insufficient() 
         unless ($self->session->user->isInGroup($self->get('groupToEditSurvey')));
 
-    #    my $ref = @{decode_json($self->session->form->process("data"))};
+    #    my $ref = @{from_json($self->session->form->process("data"))};
     my $responses = $self->session->form->paramsHashRef();
 
     my @address = split /-/, $responses->{id};
@@ -367,7 +367,7 @@ sub www_dragDrop {
     return $self->session->privilege->insufficient() 
         unless ($self->session->user->isInGroup($self->get('groupToEditSurvey')));
         
-    my $p    = decode_json( $self->session->form->process("data") );
+    my $p    = from_json( $self->session->form->process("data") );
 
     my @tid = split /-/, $p->{target}->{id};
     my @bid = split /-/, $p->{before}->{id};
@@ -512,7 +512,7 @@ sub www_loadSurvey {
         "ddhtml",  $html,    "ids",     \@ids,     "type",     $var->{type}
     };
     $self->session->http->setMimeType('application/json');
-    return encode_json($return);
+    return to_json($return);
 } ## end sub www_loadSurvey
 
 #-------------------------------------------------------------------
@@ -768,7 +768,7 @@ sub surveyEnd {
         }
     }
 #    $self->session->http->setRedirect($url);
-    return encode_json({ "type", "forward", "url", $url });
+    return to_json({ "type", "forward", "url", $url });
 } ## end sub surveyEnd
 
 #-------------------------------------------------------------------
@@ -825,7 +825,7 @@ sub prepareShowSurveyTemplate {
     my $out = $self->processTemplate( $section, $self->get("surveyQuestionsId") );
 
     $self->session->http->setMimeType('application/json');
-    return encode_json( { "type", "displayquestions", "section", $section, "questions", $questions, "html", $out } );
+    return to_json( { "type", "displayquestions", "section", $section, "questions", $questions, "html", $out } );
 } ## end sub prepareShowSurveyTemplate
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index f5981080b..060697f5c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -9,7 +9,7 @@ sub new {
     my $json   = shift;
     my $log    = shift;
     my $survey = shift;
-    my $temp = decode_json($json) if defined $json;
+    my $temp = from_json($json) if defined $json;
     my $self   = defined $temp ? $temp : {};
     $self->{survey} = $survey;
     $self->{log}    = $log;
@@ -84,7 +84,7 @@ sub freeze {
     my %temp = %{$self};
     delete $temp{log};
     delete $temp{survey};
-    return encode_json( \%temp );
+    return to_json( \%temp );
 }
 
 #Hash the survey timed out?
diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
index 4d7cceb5c..37471c1cd 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -53,7 +53,7 @@ sub new {
     my $log   = shift;
     my $self  = {};
     $self->{log} = $log;
-    my $temp = decode_json($json) if defined $json;
+    my $temp = from_json($json) if defined $json;
     $self->{sections} = defined $temp->{sections} ? $temp->{sections} : [];
     $self->{survey}   = defined $temp->{survey}   ? $temp->{survey}   : {};
     bless( $self, $class );
@@ -75,7 +75,7 @@ sub freeze {
     my %temp;
     $temp{sections} = $self->{sections};
     $temp{survey}   = $self->{survey};
-    return encode_json( \%temp );
+    return to_json( \%temp );
 }
 
 =head2 newObject ( $address )