Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 10 insertions, 9 deletions

diff --git a/util/storageconv b/util/storageconv
index 52bb77fbb..676425038 100755
--- a/util/storageconv
+++ b/util/storageconv
@@ -77,17 +77,18 @@ if($argc == 2) {
 						}
 
 						if(! file_put_contents($filename, dbunescbin($xx['content']))) {
+							@unlink($filename);
 							echo PHP_EOL . 'Failed to save file ' . $filename . PHP_EOL;
-							continue;
 						}
-				
-						$z = q("UPDATE photo SET content = '%s', os_storage = 1 WHERE id = %d",
-							dbescbin($filename),
-							intval($xx['id'])
-						);
-						if(! $z) {
-							@unlink($filename);
-							echo PHP_EOL . 'Failed to update metadata for saved file ' . $filename . PHP_EOL;
+						else {
+							$z = q("UPDATE photo SET content = '%s', os_storage = 1 WHERE id = %d",
+								dbescbin($filename),
+								intval($xx['id'])
+							);
+							if(! $z) {
+								@unlink($filename);
+								echo PHP_EOL . 'Failed to update metadata for saved file ' . $filename . PHP_EOL;
+							}
 						}
 
 						$cur_id = $xx['id'];