3 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6589f804bd..1d1c32119b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1341,11 +1341,9 @@ function parse_inline_attachments(&$text, &$attachments, &$update_count, $forum_
 }
 
 // Check if extension is allowed to be posted within forum X (forum_id 0 == private messaging)
-function extension_allowed($forum_id, $extension)
+function extension_allowed($forum_id, $extension, &$extensions)
 {
-	global $extensions;
-
-	if (!isset($extensions) || !is_array($extensions))
+	if (!sizeof($extensions))
 	{
 		$extensions = array();
 		obtain_attach_extensions($extensions);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 71c76b24f6..3e6a511c62 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -422,7 +422,7 @@ function display_attachments($forum_id, $blockname, &$attachment_data, &$update_
 
 		$denied = false;
 			
-		if (!extension_allowed($forum_id, $attachment['extension']))
+		if (!extension_allowed($forum_id, $attachment['extension'], $extensions))
 		{
 			$denied = true;
 
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 5946183b21..61a2620e74 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -157,7 +157,7 @@ function upload_attachment($forum_id, $filename, $local = false, $local_storage
 	obtain_attach_extensions($extensions);
 
 	// Check Extension
-	if (!extension_allowed($forum_id, $filedata['extension']))
+	if (!extension_allowed($forum_id, $filedata['extension'], $extensions))
 	{
 		$filedata['error'][] = sprintf($user->lang['DISALLOWED_EXTENSION'], $filedata['extension']);
 		$filedata['post_attach'] = false;