diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 14:58:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-28 14:58:59 +0000 |
| commit | a50e901f291274c22208a2891271bb50f2aa4ab1 (patch) | |
| tree | 59418655956ce2ddb709fb7f7c875af2ebca59f1 /phpBB/includes | |
| parent | 77deaf754b2f23fae66e5d5935211baaba290ade (diff) | |
| download | forums-a50e901f291274c22208a2891271bb50f2aa4ab1.tar forums-a50e901f291274c22208a2891271bb50f2aa4ab1.tar.gz forums-a50e901f291274c22208a2891271bb50f2aa4ab1.tar.bz2 forums-a50e901f291274c22208a2891271bb50f2aa4ab1.tar.xz forums-a50e901f291274c22208a2891271bb50f2aa4ab1.zip | |
- do not allow pruning founders
- 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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 6 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 2 |
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']); } |