Merge branch 'develop' into the-empty-string-conundrum

aaawtest · Jun 5, 2018 · dceaa6c · dceaa6c
2 parents d81bcb6 + 5565503
commit dceaa6c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/rocketchat-file-upload/server/lib/FileUpload.js b/packages/rocketchat-file-upload/server/lib/FileUpload.js
@@ -91,9 +91,14 @@ Object.assign(FileUpload, {
 		s.rotate();
 		// Get metadata to resize the image the first time to keep "inside" the dimensions
 		// then resize again to create the canvas around
+
 		s.metadata(Meteor.bindEnvironment((err, metadata) => {
+			if (!metadata) {
+				metadata = {};
+			}
+
 			s.toFormat(sharp.format.jpeg)
-				.resize(Math.min(height, metadata.width), Math.min(height, metadata.height))
+				.resize(Math.min(height || 0, metadata.width || Infinity), Math.min(height || 0, metadata.height || Infinity))
 				.pipe(sharp()
 					.resize(height, height)
 					.background('#FFFFFF')