From a1669b2a7f2f681b1484a9e329c54f2d070bb69c Mon Sep 17 00:00:00 2001
From: David <ottodavid@gmx.net>
Date: Wed, 15 Jan 2014 13:12:07 +0100
Subject: Fix: do json_decode before decoding UTF8 to globalisations charset
 (Fixes 492)

---
 framework/Web/UI/TPage.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'framework/Web/UI/TPage.php')

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 7f729543..2dc1cac3 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -302,6 +302,10 @@ class TPage extends TTemplateControl
 
 		$this->setAdapter(new TActivePageAdapter($this));
 
+        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        if(strlen($callbackEventParameter) > 0)
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+
         // Decode Callback postData from UTF-8 to current Charset
         if (($g=$this->getApplication()->getGlobalization(false))!==null &&
             strtoupper($enc=$g->getCharset())!='UTF-8')
-- 
cgit v1.2.3