Merge pull request #1152 from Codeinwp/fix/fallback_image_block

refactor: apply forced HTTPS only to feed img

Author: vytisbulkevicius

js/FeedzyBlock/Editor.js

@@ -312,16 +312,20 @@ class Editor extends Component {
 
 	getImageURL(item, background) {
 		let url;
-		if (item.thumbnail && this.props.attributes.thumb === 'auto') {
-			url = item.thumbnail;
+		if (
+			item.thumbnail &&
+			this.props.attributes.thumb === 'auto' &&
+			item.thumbnail !== item.default_img
+		) {
+			url = item.thumbnail.replace(/http:/g, 'https:');
 		} else if (this.props.attributes.default) {
 			url = this.props.attributes.default.url;
+		} else if (item.default_img) {
+			url = item.default_img;
 		} else {
 			url = window.feedzyjs.imagepath + 'feedzy.svg';
 		}
 
-		url = url.replace(/http:/g, 'https:');
-
 		if (background) {
 			url = 'url("' + url + '")';
 		}