From 9f060eba6eb8f2e54f5c26cc23c4f82eee7903b8 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 21 Jan 2009 17:03:00 +0000
Subject: some adjustements to the installer

git-svn-id: file:///svn/phpbb/trunk@9284 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1f6e7bcae7..e304edee0c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2006,18 +2006,27 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 {
 	global $msg_title, $msg_long_text;
 
-	// Do not display notices if we suppress them via @
-	if (error_reporting() == 0)
-	{
-		return;
-	}
-
 	// Message handler is stripping text. In case we need it, we are able to define long text...
 	if (isset($msg_long_text) && $msg_long_text && !$msg_text)
 	{
 		$msg_text = $msg_long_text;
 	}
 
+	// Store information for later use
+	phpbb::$last_notice = array(
+		'file'		=> $errfile,
+		'line'		=> $errline,
+		'message'	=> $msg_text,
+		'php_error'	=> (!empty($php_errormsg)) ? $php_errormsg : '',
+		'errno'		=> $errno,
+	);
+
+	// Do not display notices if we suppress them via @
+	if (error_reporting() == 0)
+	{
+		return;
+	}
+
 	switch ($errno)
 	{
 		case E_NOTICE:
-- 
cgit v1.2.1