summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/Data/SqlMap/Statements/TMappedStatement.php1
-rw-r--r--framework/TComponent.php5
2 files changed, 4 insertions, 2 deletions
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);
+ }
}