1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00

merge r8956, r8957 and r8960

git-svn-id: file:///svn/phpbb/trunk@8961 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-09-30 15:18:35 +00:00
parent e4c3a743ca
commit ad4d7c036e
5 changed files with 17 additions and 13 deletions

View File

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