move js files from core

17 files changed, 15 insertions, 14 deletions

diff --git a/include/zot.php b/include/zot.php
index 9d6f462fe..97c9c4a36 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1368,7 +1368,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
 			remove_community_tag($sender,$arr,$channel['channel_id']);
 
 			$item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
-			$result[] = array($d['hash'],'deleted',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
+			$result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
 
 			if($relay && $item_id) {
 				logger('process_delivery: invoking relay');
@@ -1524,10 +1524,11 @@ function delete_imported_item($sender,$item,$uid) {
 
 	logger('delete_imported_item invoked',LOGGER_DEBUG);
 
-	$r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' )
+	$r = q("select id from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
 		and mid = '%s' and uid = %d limit 1",
 		dbesc($sender['hash']),
 		dbesc($sender['hash']),
+		dbesc($sender['hash']),
 		dbesc($item['mid']),
 		intval($uid)
 	);
diff --git a/version.inc b/version.inc
index 7312c7541..e6b9a3f5f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-03.546
+2014-01-04.547
diff --git a/js/acl.js b/view/js/acl.js
index 906b28354..906b28354 100644
--- a/js/acl.js
+++ b/view/js/acl.js
diff --git a/js/ajaxupload.js b/view/js/ajaxupload.js
index 5719f30e0..5719f30e0 100644
--- a/js/ajaxupload.js
+++ b/view/js/ajaxupload.js
diff --git a/js/crypto.js b/view/js/crypto.js
index 2e6402c62..2e6402c62 100644
--- a/js/crypto.js
+++ b/view/js/crypto.js
diff --git a/js/fk.autocomplete.js b/view/js/fk.autocomplete.js
index 763ca354d..763ca354d 100644
--- a/js/fk.autocomplete.js
+++ b/view/js/fk.autocomplete.js
diff --git a/js/icon_translate.js b/view/js/icon_translate.js
index 9e69e0b7d..9e69e0b7d 100644
--- a/js/icon_translate.js
+++ b/view/js/icon_translate.js
diff --git a/js/jquery-compat.js b/view/js/jquery-compat.js
index 7bf912542..7bf912542 100644
--- a/js/jquery-compat.js
+++ b/view/js/jquery-compat.js
diff --git a/js/jquery-migrate-1.1.1.js b/view/js/jquery-migrate-1.1.1.js
index e99f954e6..e99f954e6 100644
--- a/js/jquery-migrate-1.1.1.js
+++ b/view/js/jquery-migrate-1.1.1.js
diff --git a/js/jquery.htmlstream.js b/view/js/jquery.htmlstream.js
index c62c538f7..c62c538f7 100644
--- a/js/jquery.htmlstream.js
+++ b/view/js/jquery.htmlstream.js
diff --git a/js/jquery.js b/view/js/jquery.js
index 006e95310..006e95310 100644
--- a/js/jquery.js
+++ b/view/js/jquery.js
diff --git a/js/jquery.spin.js b/view/js/jquery.spin.js
index a35a27765..a35a27765 100644
--- a/js/jquery.spin.js
+++ b/view/js/jquery.spin.js
diff --git a/js/jquery.textinputs.js b/view/js/jquery.textinputs.js
index fd6d14569..fd6d14569 100644
--- a/js/jquery.textinputs.js
+++ b/view/js/jquery.textinputs.js
diff --git a/js/main.js b/view/js/main.js
index c8e9fc9a2..c8e9fc9a2 100644
--- a/js/main.js
+++ b/view/js/main.js
diff --git a/js/spin.js b/view/js/spin.js
index c66c607a7..c66c607a7 100644
--- a/js/spin.js
+++ b/view/js/spin.js
diff --git a/js/webtoolkit.base64.js b/view/js/webtoolkit.base64.js
index 5fa3c1ed7..5fa3c1ed7 100644
--- a/js/webtoolkit.base64.js
+++ b/view/js/webtoolkit.base64.js
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 4aecb8ecf..da50144dc 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -17,15 +17,15 @@ head_add_css('view/css/bootstrap-red.css');
 head_add_css('view/css/widgets.css');
 head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
 
-head_add_js('js/jquery.js');
+head_add_js('jquery.js');
 head_add_js('library/bootstrap/js/bootstrap.min.js');
 head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('js/jquery-migrate-1.1.1.js');
-//head_add_js('js/jquery-compat.js');
-head_add_js('js/spin.js');
-head_add_js('js/jquery.spin.js');
-head_add_js('js/jquery.textinputs.js');
-head_add_js('js/fk.autocomplete.js');
+head_add_js('jquery-migrate-1.1.1.js');
+//head_add_js('jquery-compat.js');
+head_add_js('spin.js');
+head_add_js('jquery.spin.js');
+head_add_js('jquery.textinputs.js');
+head_add_js('fk.autocomplete.js');
 head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
@@ -37,10 +37,10 @@ head_add_js('library/cryptojs/components/core-min.js');
 head_add_js('library/cryptojs/rollups/aes.js');
 head_add_js('library/cryptojs/rollups/rabbit.js');
 head_add_js('library/cryptojs/rollups/tripledes.js');
-head_add_js('js/acl.js');
-head_add_js('js/webtoolkit.base64.js');
-head_add_js('js/main.js');
-head_add_js('js/crypto.js');
+head_add_js('acl.js');
+head_add_js('webtoolkit.base64.js');
+head_add_js('main.js');
+head_add_js('crypto.js');
 head_add_js('library/jslider/bin/jquery.slider.min.js');
 head_add_js('docready.js');
 head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');