move js files from core

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)
 	);

version.inc

@@ -1 +1 @@
-2014-01-03.546
+2014-01-04.547

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');