From 50e3173e8c2f8304ad79e228df8526f9caf7b999 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:46:12 +0100
Subject: [PATCH] [ticket/11586] Combine $filedata['post_attach'] assign into a
 single statement.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a31d3b5a3f..d6f7c9bab4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -403,14 +403,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		$upload->set_disallowed_content(explode('|', $config['mime_triggers']));
 	}
 
-	if (!$local)
-	{
-		$filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false;
-	}
-	else
-	{
-		$filedata['post_attach'] = true;
-	}
+	$filedata['post_attach'] = $local || $upload->is_valid($form_name);
 
 	if (!$filedata['post_attach'])
 	{