3 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index f988d009ad..72fca905e0 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1401,7 +1401,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
 
 		// no break;
 	}
-	
+
 	if (!isset($username_string))
 	{
 		if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 94eef89c05..c640865212 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -1051,7 +1051,7 @@ class fileupload
 	*/
 	static public function image_types()
 	{
-		return array(
+		$result = array(
 			IMAGETYPE_GIF		=> array('gif'),
 			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
 			IMAGETYPE_PNG		=> array('png'),
@@ -1064,10 +1064,16 @@ class fileupload
 			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
 			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
 			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
-			IMAGETYPE_SWC		=> array('swc'),
 			IMAGETYPE_IFF		=> array('iff'),
 			IMAGETYPE_WBMP		=> array('wbmp'),
 			IMAGETYPE_XBM		=> array('xbm'),
 		);
+
+		if (defined('IMAGETYPE_SWC'))
+		{
+			$result[IMAGETYPE_SWC] = array('swc');
+		}
+
+		return $result;
 	}
 }
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5dd39dbf0f..e2ca3a8752 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -655,7 +655,7 @@ class mcp_queue
 					if (!$post_data['topic_posts_approved'])
 					{
 						$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
-						
+
 						if ($post_data['post_visibility'] == ITEM_UNAPPROVED)
 						{
 							$phpbb_notifications->add_notifications(array('topic'), $post_data);