From 7b3f6cb219cac448ba470f016ed5068bdc7ffc56 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 00:55:24 +0200
Subject: [ticket/10369] Always include errfile and errline in format_errors().

We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
---
 phpBB/includes/error_collector.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/error_collector.php')

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 55834f354c..534df27ece 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -42,6 +42,8 @@ class phpbb_error_collector
 
 	function format_errors()
 	{
+		$phpbb_root_path = phpbb_realpath(dirname(__FILE__) . '/../');
+
 		$text = '';
 		foreach ($this->errors as $error)
 		{
@@ -49,13 +51,15 @@ class phpbb_error_collector
 			{
 				$text .= "<br />\n";
 			}
+
 			list($errno, $msg_text, $errfile, $errline) = $error;
-			$text .= "Errno $errno: $msg_text";
-			if (defined('DEBUG_EXTRA') || defined('IN_INSTALL'))
-			{
-				$text .= " at $errfile line $errline";
-			}
+
+			// Prevent leakage of local path to phpBB install
+			$errfile = str_replace(array($phpbb_root_path, '\\'), array('', '/'), $errfile);
+
+			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
+
 		return $text;
 	}
 }
-- 
cgit v1.2.1


From 9006984d5ab7478e9187d14c5ab331057b1af9a4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 22:20:20 +0200
Subject: [ticket/10369] DRY code to remove phpbb path from errfile.

PHPBB3-10369
---
 phpBB/includes/error_collector.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/includes/error_collector.php')

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 534df27ece..040be4dd13 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -42,8 +42,6 @@ class phpbb_error_collector
 
 	function format_errors()
 	{
-		$phpbb_root_path = phpbb_realpath(dirname(__FILE__) . '/../');
-
 		$text = '';
 		foreach ($this->errors as $error)
 		{
@@ -55,7 +53,7 @@ class phpbb_error_collector
 			list($errno, $msg_text, $errfile, $errline) = $error;
 
 			// Prevent leakage of local path to phpBB install
-			$errfile = str_replace(array($phpbb_root_path, '\\'), array('', '/'), $errfile);
+			$errfile = phpbb_filter_errfile($errfile);
 
 			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
-- 
cgit v1.2.1


From 1ad97424a469fe2e36a3c3a616b5e49def292779 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 18 Sep 2011 22:32:25 +0200
Subject: [ticket/10369] Rename filter_errfile() to filter_root_path().

PHPBB3-10369
---
 phpBB/includes/error_collector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/error_collector.php')

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 040be4dd13..3c0a89a1f3 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -53,7 +53,7 @@ class phpbb_error_collector
 			list($errno, $msg_text, $errfile, $errline) = $error;
 
 			// Prevent leakage of local path to phpBB install
-			$errfile = phpbb_filter_errfile($errfile);
+			$errfile = phpbb_filter_root_path($errfile);
 
 			$text .= "Errno $errno: $msg_text at $errfile line $errline";
 		}
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/includes/error_collector.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes/error_collector.php')

diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
index 3c0a89a1f3..358da747b8 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/includes/error_collector.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB
-* @version $Id$
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1