mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 09:35:24 +02:00
Code Issues Releases Wiki Activity

- do not allow pruning founders

Browse Source 
- do not display full path to installation in error message text (only occurence would be "header already sent" warnings)


git-svn-id: file:///svn/phpbb/trunk@5975 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-28 14:58:59 +00:00
parent 77deaf754b
commit a50e901f29
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_prune.php
View File

@ -251,8 +251,10 @@ class acp_prune
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Do not prune founder members
$sql = 'SELECT username, user_id FROM ' . USERS_TABLE . ' $sql = 'SELECT username, user_id FROM ' . USERS_TABLE . '
WHERE user_id <> ' . ANONYMOUS . " WHERE user_id <> ' . ANONYMOUS . '
AND user_type <> ' . USER_FOUNDER . "
$where_sql"; $where_sql";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

6
phpBB/includes/functions.php
View File

@ -2097,7 +2097,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
{ {
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) 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";
} }
} }

2
phpBB/includes/mcp/mcp_warn.php
View File

@ -240,7 +240,7 @@ function mcp_warn_post_view($id, $mode, $action)
if ($userrow['bbcode_bitfield']) if ($userrow['bbcode_bitfield'])
{ {
include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); 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']); $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
} }