Merge branch 'dev' into docu

2017-11-04 10:22:58 +01:00
parent 1a737be2b4 39c194c5c3
commit cfbeb1655d
2061 changed files with 487455 additions and 500754 deletions
--- a/include/photos.php
+++ b/include/photos.php
@@ -74,6 +74,9 @@ function photo_upload($channel, $observer, $args) {
 				$imagedata = @file_get_contents($tmp_name);
 				@unlink($tmp_name);
 			}
+			else {
+				$imagedata = @file_get_contents($args['os_syspath']);
+			}
 		}
 		else {
 			$imagedata = @file_get_contents($args['os_syspath']);