summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <ottodavid@gmx.net>2014-01-15 13:12:07 +0100
committerDavid <ottodavid@gmx.net>2014-08-21 17:21:24 +0200
commit2569689ee43ca2b29bd36d13f5b9c407ad5abc86 (patch)
treefbba30d89372ae9fe0bbbfb69c6b3397efd00dac
parent6215202c20ab394f273c4b79b71f80003bf757f4 (diff)
Fix: do json_decode before decoding UTF8 to globalisations charset
(Fixes 492)(cherry picked from commit a1669b2a7f2f681b1484a9e329c54f2d070bb69c)
-rw-r--r--framework/Web/UI/ActiveControls/TActivePageAdapter.php5
-rw-r--r--framework/Web/UI/TPage.php4
2 files changed, 6 insertions, 3 deletions
diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index 95bb9655..60670c09 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -294,7 +294,7 @@ class TActivePageAdapter extends TControlAdapter
}
/**
- * Gets callback parameter. JSON encoding is assumed.
+ * Gets callback parameter.
* @return string postback event parameter
*/
public function getCallbackEventParameter()
@@ -302,8 +302,7 @@ class TActivePageAdapter extends TControlAdapter
if($this->_callbackEventParameter===null)
{
$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
- if(strlen($param) > 0)
- $this->_callbackEventParameter=TJavaScript::jsonDecode((string)$param);
+ $this->_callbackEventParameter=$param;
}
return $this->_callbackEventParameter;
}
diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 94d1929a..412d14b6 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -306,6 +306,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')