From d245e8ef48397292adea6ff652b54e14c40053f6 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 27 Mar 2008 20:29:07 +0000
Subject: [PATCH] fixed: Poll question/answers with international text
 corrupted

---
 docs/changelog/7.x.x.txt         | 1 +
 lib/WebGUI/Asset/Wobject/Poll.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 950848ebe..3efbc64c5 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fixed: Collaboration System attachments follow site's max size instead of CS's
  - fixed: Rich editor image uploader doesn't follow size limits
  - make sure all tables are using UTF-8
+ - fixed: Poll question/answers with international text corrupted
 
 7.5.8
  - moved Gallery utility methods to WebGUI::Utility::Gallery
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 803ec5d02..4c35a8fd8 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -192,7 +192,7 @@ sub freezeGraphConfig {
     my $self        = shift;
     my $obj         = shift;
     
-    return JSON::to_json($obj);
+    return JSON::encode_json($obj);
 }
 
 
@@ -404,7 +404,7 @@ sub thawGraphConfig {
     my $string      = shift;
     
     return unless $string;
-    return JSON::from_json($string);
+    return JSON::decode_json($string);
 }
 
 #-------------------------------------------------------------------