Merge pull request #13 from mar-kolya/master

Fixed an empty image issue and an image list issue
dchester · Mar 12, 2014 · 0d51ea7 · 0d51ea7
2 parents 4c8b620 + ba4aa51
commit 0d51ea7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/plugins/image/config.js b/plugins/image/config.js
@@ -20,6 +20,7 @@ module.exports = {
 			return callback([]);
 		}
 
+		if (!parsed_data) return callback(null);
 		var file_id = parsed_data.file_id;
 
 		models.files.find({ where: { id: file_id } })

diff --git a/plugins/image_list/template.html b/plugins/image_list/template.html
@@ -11,7 +11,7 @@
 (function() {
 
 	try {
-		var files = {{ item[field.name]|json_encode|raw }};
+		var files = {{ item.data[field.name]|json_encode|raw }};
 	} catch(e) {
 		return;
 	}