From d840107832b1f59a9fc3b93ffb97ef976be1b83c Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Thu, 17 Nov 2011 16:52:56 +0000
Subject: 3-in-1 bugfix commit: 1) TErrorHandler: avoid an error when trying to
 hide the file path of a lambda function 2) TSecurityManager: avoid a race
 condition when first generating the encryptionkey or the validationkey 3)
 TActiveFileUpload: urlencode the base64'ed token since it can contain the "+"
 character (otherway it would be traslated to a space)

---
 framework/Exceptions/TErrorHandler.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 1fe5a928..363bdecf 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2011 PradoSoft
+ * @copyright Copyright &copy; 2005-2011 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Exceptions
@@ -83,8 +83,8 @@ class TErrorHandler extends TModule
 	 * @return string the directory containing error template files.
 	 */
 	public function getErrorTemplatePath()
-	{
-		if($this->_templatePath===null)
+	{
+		if($this->_templatePath===null)
 			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
 		return $this->_templatePath;
 	}
@@ -154,8 +154,8 @@ class TErrorHandler extends TModule
 			$aTrace = $exception->getTrace();
 			foreach($aTrace as $item)
 			{
-				$file = $item['file'];
-				$aRpl[dirname($file) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				if(isset($item['file']))
+					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
-- 
cgit v1.2.3