From: Michael <heluecht@pirati.ca>
Date: Thu, 13 Jul 2017 20:38:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=181947f774c878f806a72de391fbab7fb5b273f5;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

Conflicts:
	include/text.php
---

181947f774c878f806a72de391fbab7fb5b273f5
diff --cc include/text.php
index 2a8b84c65f,ea5deb4c14..43cdad8ba6
--- a/include/text.php
+++ b/include/text.php
@@@ -1397,12 -1411,11 +1411,11 @@@ function prepare_body(&$item, $attach 
  						));
  					}
  
 -					$filetype = strtolower(substr( $mime, 0, strpos($mime,'/') ));
 +					$filetype = strtolower(substr($mime, 0, strpos($mime,'/')));
- 					if($filetype) {
+ 					if ($filetype) {
 -						$filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 ));
 +						$filesubtype = strtolower(substr($mime, strpos($mime,'/') + 1));
  						$filesubtype = str_replace('.', '-', $filesubtype);
- 					}
- 					else {
+ 					} else {
  						$filetype = 'unkn';
  						$filesubtype = 'unkn';
  					}