summaryrefslogtreecommitdiff
path: root/framework/Exceptions
diff options
context:
space:
mode:
authorgodzilla80@gmx.net <>2010-02-21 11:34:12 +0000
committergodzilla80@gmx.net <>2010-02-21 11:34:12 +0000
commita779552bc0809d5673d7b4353168aef8114035b4 (patch)
tree4731d3c0867cbdba8a88facade20fda506226df9 /framework/Exceptions
parentc3dbc4d210cfb9d96961a990aa74c55560f2b4b4 (diff)
Merged latest changes into trunk (except r2773)
/branches/3.1:r2765,2770-2771,2774,2776-2778
Diffstat (limited to 'framework/Exceptions')
-rw-r--r--framework/Exceptions/TErrorHandler.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 3b5927d6..4ac312d0 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -161,6 +161,7 @@ class TErrorHandler extends TModule
$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
+ if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
$aRpl = array_reverse($aRpl, true);
return str_replace(array_keys($aRpl), $aRpl, $value);