Merge pull request #2 from xpressengine/develop

Sync Develop2

classes/db/DB.class.php

@@ -439,7 +439,7 @@ function actFinish()
 					$buff[] = '<?php exit(); ?' . '>';
 				}
 				$buff[] = print_r($log, TRUE);
-				@file_put_contents($log_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
+				@file_put_contents($debug_file, implode("\n", $buff) . "\n\n", FILE_APPEND|LOCK_EX);
 			}
 		}
 		else

common/js/plugins/jquery.fileupload/js/main.js

@@ -266,6 +266,7 @@
 			var self = this;
 			var file_srls = [];
 			var data = $container.data();
+			var img = _getCkeInstance(data.editorSequence).document.find('img');
 
 			if(!file_srl)
 			{
@@ -288,6 +289,21 @@
 				file_srls = file_srls.split(',');
 				$.each(file_srls, function(idx, srl){
 					data.settings.fileList.find('ul').find('li[data-file-srl=' + srl + ']').remove();
+
+
+					for(var i = 0; i <= img.count() - 1; i++) {
+						var elItem = img.getItem(i);
+						if(elItem.getAttribute('data-file-srl') == srl) {
+							var elParent = elItem.getParent();
+							console.debug('_deleteFile', elParent, elParent.getHtml(), elParent.getChildCount(), elParent.getChildren())
+
+							if(elParent.getChildCount() === 1) {
+								elParent.remove();
+							} else {
+								elItem.remove();
+							}
+						}
+					}
 				});
 				self.loadFilelist($container);
 			});