mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-20 18:28:55 +00:00
Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-ascraeus: [ticket/12964] Correct use of undefined $row variable.
This commit is contained in:
commit
d86411b38a
1 changed files with 2 additions and 2 deletions
|
@ -224,12 +224,12 @@ else
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Attachment is in a private message.
|
// Attachment is in a private message.
|
||||||
$row['forum_id'] = false;
|
$post_row = array('forum_id' => false);
|
||||||
phpbb_download_handle_pm_auth($db, $auth, $user->data['user_id'], $attachment['post_msg_id']);
|
phpbb_download_handle_pm_auth($db, $auth, $user->data['user_id'], $attachment['post_msg_id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$extensions = array();
|
$extensions = array();
|
||||||
if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
|
if (!extension_allowed($post_row['forum_id'], $attachment['extension'], $extensions))
|
||||||
{
|
{
|
||||||
send_status_line(403, 'Forbidden');
|
send_status_line(403, 'Forbidden');
|
||||||
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
|
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
|
||||||
|
|
Loading…
Add table
Reference in a new issue