From a779552bc0809d5673d7b4353168aef8114035b4 Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 21 Feb 2010 11:34:12 +0000
Subject: Merged latest changes into trunk (except r2773)
 /branches/3.1:r2765,2770-2771,2774,2776-2778

---
 framework/Exceptions/TErrorHandler.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'framework/Exceptions/TErrorHandler.php')

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);
-- 
cgit v1.2.3