aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2014-08-10 18:38:08 +0200
committerDhruv <dhruv.goel92@gmail.com>2014-08-10 18:38:08 +0200
commitd86411b38a24ea31f05b904dbac98cd81ddf6e88 (patch)
treebe82ce07cf7b4e32e51c4dd448f91c664c315b63
parent06be2ff67d5b44e2fa9e2317e63b6dc758bf301a (diff)
parente0d377bca70cff7846ba920a03b717aac1d208a4 (diff)
downloadforums-d86411b38a24ea31f05b904dbac98cd81ddf6e88.tar
forums-d86411b38a24ea31f05b904dbac98cd81ddf6e88.tar.gz
forums-d86411b38a24ea31f05b904dbac98cd81ddf6e88.tar.bz2
forums-d86411b38a24ea31f05b904dbac98cd81ddf6e88.tar.xz
forums-d86411b38a24ea31f05b904dbac98cd81ddf6e88.zip
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.
-rw-r--r--phpBB/download/file.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 984de2165f..fd94e78fee 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -224,12 +224,12 @@ else
else
{
// 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']);
}
$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');
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));