summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:43:27 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:43:27 +0100
commit65adcbec2cc9a00a5b0611e34c7141bf4e6d63f7 (patch)
tree2a2f353f2f7b0fd6cde035068a2036ab630f688b /framework/Web/UI
parenta1983c5f49f5ec95da2d3848a0250771a870534d (diff)
parent5632770c86d30361fe0c3eefc7d327786b478702 (diff)
Merge branch 'jquery' of https://github.com/pradosoft/prado into jquery
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/TPage.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 4e8652f4..394229da 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -1275,9 +1275,9 @@ class TPageStateFormatter
{
$sm=$page->getApplication()->getSecurityManager();
if($page->getEnableStateValidation())
- $str=$sm->hashData(Prado::serialize($data));
+ $str=$sm->hashData(serialize($data));
else
- $str=Prado::serialize($data);
+ $str=serialize($data);
if($page->getEnableStateCompression() && extension_loaded('zlib'))
$str=gzcompress($str);
if($page->getEnableStateEncryption())
@@ -1305,10 +1305,10 @@ class TPageStateFormatter
if($page->getEnableStateValidation())
{
if(($str=$sm->validateData($str))!==false)
- return Prado::unserialize($str);
+ return unserialize($str);
}
else
- return Prado::unserialize($str);
+ return unserialize($str);
}
return null;
}