Merge branch 'master' of https://github.com/friendica/red

to be in sync with main repro

doc/External-Resources.md

@@ -8,7 +8,7 @@ External Resources
 * [APW](https://github.com/beardy-unixer/apw)
 * [Redstrap](https://github.com/omigeot/redstrap3)
 * [Pluto](https://github.com/23n/Pluto)
-* [bootstrap](https://bitbucket.org/tobiasd/red-theme-bootstrap/overview)
+* [clean](https://bitbucket.org/tobiasd/red-clean)
 
 
 **Third-Party Addons**

include/photo/photo_driver.php

@@ -357,7 +357,7 @@ abstract class photo_driver {
 				dbesc($p['resource_id']),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
+				dbesc(basename($p['filename'])),
 				dbesc($this->getType()),
 				dbesc($p['album']),
 				intval($this->getHeight()),

include/photos.php

@@ -77,6 +77,7 @@ function photo_upload($channel, $observer, $args) {
 		$filesize   = intval($_FILES['userfile']['size']);
 		$type       = $_FILES['userfile']['type'];
 	}
+
 	if (! $type) 
 		$type=guess_image_type($filename);