3 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index c4db029b8d..2214a8c9bd 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -250,9 +250,11 @@ class acp_prune
 					$bot_ids[] = $row['user_id'];
 				}
 				$db->sql_freeresult($result);
-				
+
+				// Do not prune founder members
 				$sql = 'SELECT username, user_id FROM ' . USERS_TABLE . '
-					WHERE user_id <> ' . ANONYMOUS . "
+					WHERE user_id <> ' . ANONYMOUS . '
+						AND user_type <> ' . USER_FOUNDER . "
 					$where_sql";
 				$result = $db->sql_query($sql);
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index db612f7aa5..525c215845 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2097,7 +2097,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 			{
 				if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 				{
-					echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . str_replace(array(realpath($phpbb_root_path), '\\'), array('', '/'), $errfile) . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
+					// remove complete path to installation, with the risk of changing backslashes meant to be there
+					$errfile = str_replace(array(realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
+					$msg_text = str_replace(array(realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
+
+					echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
 				}
 			}
 		
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 2e7f191765..4ea2e04d99 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -240,7 +240,7 @@ function mcp_warn_post_view($id, $mode, $action)
 	if ($userrow['bbcode_bitfield'])
 	{
 		include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx);
-		$bbcode = new bbcode($post_info['bbcode_bitfield']);
+		$bbcode = new bbcode($userrow['bbcode_bitfield']);
 		$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
 	}