diff options
| author | emkael <emkael@tlen.pl> | 2016-04-08 12:49:19 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-04-08 12:49:19 +0200 |
| commit | 843c8045c2b5bf647fe8559ac5dee810736345c2 (patch) | |
| tree | 5acb47016b2a67cfe7cf659c12166823f38e2bf8 /lib/prado | |
| parent | a4440ac4c32c3fd435ec9abe4181f8dac9353206 (diff) | |
* Prado upgraded to 3.3.rb4ed61bfeffee3a47e8b313f64cc7436a99cb460
Diffstat (limited to 'lib/prado')
| -rw-r--r-- | lib/prado/HISTORY | 1 | ||||
| -rw-r--r-- | lib/prado/framework/Data/SqlMap/Statements/TMappedStatement.php | 1 | ||||
| -rw-r--r-- | lib/prado/framework/TComponent.php | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lib/prado/HISTORY b/lib/prado/HISTORY index ea1c889..3679f27 100644 --- a/lib/prado/HISTORY +++ b/lib/prado/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/lib/prado/framework/Data/SqlMap/Statements/TMappedStatement.php b/lib/prado/framework/Data/SqlMap/Statements/TMappedStatement.php index 43f129f..abade1b 100644 --- a/lib/prado/framework/Data/SqlMap/Statements/TMappedStatement.php +++ b/lib/prado/framework/Data/SqlMap/Statements/TMappedStatement.php @@ -1232,3 +1232,4 @@ class TResultSetMapItemParameter extends TComponent return $this->_map; } } + diff --git a/lib/prado/framework/TComponent.php b/lib/prado/framework/TComponent.php index 127b68a..0752d04 100644 --- a/lib/prado/framework/TComponent.php +++ b/lib/prado/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); + } } |