diff options
| author | emkael <emkael@tlen.pl> | 2016-04-07 16:09:16 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-04-07 16:09:16 +0200 |
| commit | d42b25cbf6d3f1e51cb2a3149f1ff54cc5474bc9 (patch) | |
| tree | 96b734357392d6094cfc5f8284ad8f2578b96b7f /lib/prado/framework/Exceptions/TErrorHandler.php | |
| parent | ac6c2b9c4f787dfdfa00547f764c77d80dad14c0 (diff) | |
* Prado upgrade (to 3.3.r6b8e6601752b21a8a96c385a5529bbec7bb2b408)
Diffstat (limited to 'lib/prado/framework/Exceptions/TErrorHandler.php')
| -rw-r--r-- | lib/prado/framework/Exceptions/TErrorHandler.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/prado/framework/Exceptions/TErrorHandler.php b/lib/prado/framework/Exceptions/TErrorHandler.php index f9a120a..76f7396 100644 --- a/lib/prado/framework/Exceptions/TErrorHandler.php +++ b/lib/prado/framework/Exceptions/TErrorHandler.php @@ -4,7 +4,7 @@ * * @author Qiang Xue <qiang.xue@gmail.com> * @link https://github.com/pradosoft/prado - * @copyright Copyright © 2005-2015 The PRADO Group + * @copyright Copyright © 2005-2016 The PRADO Group * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.Exceptions */ @@ -345,7 +345,12 @@ class TErrorHandler extends TModule // if PHP exception, we want to show the 2nd stack level context // because the 1st stack level is of little use (it's in error handler) if($exception instanceof TPhpErrorException) - $result=isset($trace[0]['file'])?$trace[0]:$trace[1]; + { + if(isset($trace[0]['file'])) + $result=$trace[0]; + elseif(isset($trace[1])) + $result=$trace[1]; + } else if($exception instanceof TInvalidOperationException) { // in case of getter or setter error, find out the exact file and row |