makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

further adjustments to exit; statements

Browse source 
force E_USER_ERROR to exit *always* - it is always a fatal error which should stop every execution happening

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8957 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-09-30 09:49:20 +00:00
parent eef41d039e
commit 77cf8e50d9
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/functions.php
View file

@ -3228,6 +3228,9 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
echo '</html>'; echo '</html>';
exit_handler(); exit_handler();
// On a fatal error (and E_USER_ERROR *is* fatal) we never want other scripts to continue and force an exit here.
exit;
break; break;
case E_USER_WARNING: case E_USER_WARNING:

5
phpBB/mcp.php
View file

@ -166,7 +166,7 @@ if ($quickmod)
case 'delete_post': case 'delete_post':
case 'delete_topic': case 'delete_topic':
$module->load('mcp', 'main', 'quickmod'); $module->load('mcp', 'main', 'quickmod');
exit; return;
break; break;
case 'topic_logs': case 'topic_logs':
@ -183,7 +183,8 @@ if ($quickmod)
break; break;
default: default:
trigger_error("$action not allowed as quickmod"); trigger_error("$action not allowed as quickmod", E_USER_ERROR);
break;
} }
} }
else else

6
phpBB/posting.php
View file

@ -114,7 +114,7 @@ switch ($mode)
else else
{ {
upload_popup(); upload_popup();
exit; return;
} }
break; break;
@ -145,7 +145,7 @@ if (!$post_data)
if ($mode == 'popup') if ($mode == 'popup')
{ {
upload_popup($post_data['forum_style']); upload_popup($post_data['forum_style']);
exit; return;
} }
$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']); $user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
@ -276,7 +276,7 @@ if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id))
if ($mode == 'delete') if ($mode == 'delete')
{ {
handle_post_delete($forum_id, $topic_id, $post_id, $post_data); handle_post_delete($forum_id, $topic_id, $post_id, $post_data);
exit; return;
} }
// Handle bump mode... // Handle bump mode...

2
phpBB/viewforum.php
View file

@ -113,7 +113,7 @@ if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'])
// We redirect to the url. The third parameter indicates that external redirects are allowed. // We redirect to the url. The third parameter indicates that external redirects are allowed.
redirect($forum_data['forum_link'], false, true); redirect($forum_data['forum_link'], false, true);
exit; return;
} }
// Build navigation links // Build navigation links