summaryrefslogtreecommitdiff
path: root/framework/Web/UI/TPage.php
diff options
context:
space:
mode:
authorDavid <ottodavid@gmx.net>2014-01-15 13:12:07 +0100
committerDavid <ottodavid@gmx.net>2014-01-15 13:12:07 +0100
commita1669b2a7f2f681b1484a9e329c54f2d070bb69c (patch)
tree7cc554ad5749c64679ec756e34c1f1ba4183954e /framework/Web/UI/TPage.php
parentac4eaa30cc19cddec0aae5621d136a5a5fe7777c (diff)
Fix: do json_decode before decoding UTF8 to globalisations charset
(Fixes 492)
Diffstat (limited to 'framework/Web/UI/TPage.php')
-rw-r--r--framework/Web/UI/TPage.php4
1 files changed, 4 insertions, 0 deletions
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')