summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2016-04-08 11:02:26 +0200
committerFabio Bas <ctrlaltca@gmail.com>2016-04-08 11:52:17 +0200
commit8a58971e4f9fec9e17a1817de7949326681d8de4 (patch)
tree4060fa306e48874ec82ec9d840eca46a729682e8
parent6b8e6601752b21a8a96c385a5529bbec7bb2b408 (diff)
Possible fix for #585
-rw-r--r--HISTORY1
-rw-r--r--framework/Data/SqlMap/Statements/TMappedStatement.php1
-rw-r--r--framework/TComponent.php5
3 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index ea1c8892..3679f27f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ BUG: Issue #540 - Fix TActiveFileUpload on IE11 (ctrlaltca)
BUG: Issue #574 - Fix TActiveCustomValidator validation after error (ctrlaltca)
BUG: Issue #581 - TActiveFileUpload loses track of LocalName for a moment (emkael)
BUG: Issue #582 - Prado autoloader breaks class_exists conditionals (ctrlaltca)
+BUG: Issue #585 - Calling unserialize() on TMappedStatement throws TApplicationException (emkael)
BUG: TJuiAutoComplete: fix parsing of suggestions (ctrlaltca)
BUG: Fix callback for controls with PostState=false (ctrlaltca)
BUG: Fix stopping even propagation on javascript events (ctrlaltca)
diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php
index 0883564f..abade1b2 100644
--- a/framework/Data/SqlMap/Statements/TMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TMappedStatement.php
@@ -919,7 +919,6 @@ class TMappedStatement extends TComponent implements IMappedStatement
public function __wakeup()
{
- parent::__wakeup();
if (is_null($this->_selectQueue)) $this->_selectQueue = array();
}
diff --git a/framework/TComponent.php b/framework/TComponent.php
index 127b68a3..0752d04c 100644
--- a/framework/TComponent.php
+++ b/framework/TComponent.php
@@ -555,7 +555,10 @@ class TComponent
return isset($args[0])?$args[0]:null;
}
- throw new TApplicationException('component_method_undefined',get_class($this),$method);
+ // don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
+ if (!method_exists($this, $method)) {
+ throw new TApplicationException('component_method_undefined',get_class($this),$method);
+ }
}