Make sure attachmentUploadDir is not a string representing a director…

…y instead of a serialized array - tries to address #2555
elkarte · Jun 19, 2016 · e544bbb · e544bbb
1 parent cbf5d1a
commit e544bbb
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sources/subs/Attachments.subs.php b/sources/subs/Attachments.subs.php
@@ -358,7 +358,13 @@ function processAttachments($id_msg = null)
 		automanage_attachments_check_directory();
 
 	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = unserialize($modSettings['attachmentUploadDir']);
+	{
+		$attachmentUploadDir = @unserialize($modSettings['attachmentUploadDir']);
+		if (!empty($attachmentUploadDir))
+		{
+			$modSettings['attachmentUploadDir'] = $attachmentUploadDir;
+		}
+	}
 
 	$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];