harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move js files from core

Browse Source
This commit is contained in:
friendica 2014-01-04 03:58:21 -08:00
parent 9f4e9f247a
commit 0c85c97480
17 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/zot.php
View File

@ -1368,7 +1368,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
remove_community_tag($sender,$arr,$channel['channel_id']); remove_community_tag($sender,$arr,$channel['channel_id']);
$item_id = delete_imported_item($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) { if($relay && $item_id) {
logger('process_delivery: invoking relay'); logger('process_delivery: invoking relay');
@ -1524,10 +1524,11 @@ function delete_imported_item($sender,$item,$uid) {
logger('delete_imported_item invoked',LOGGER_DEBUG); 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", and mid = '%s' and uid = %d limit 1",
dbesc($sender['hash']), dbesc($sender['hash']),
dbesc($sender['hash']), dbesc($sender['hash']),
dbesc($sender['hash']),
dbesc($item['mid']), dbesc($item['mid']),
intval($uid) intval($uid)
); );

2
version.inc
View File

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

0
js/acl.js → view/js/acl.js
View File

0
js/ajaxupload.js → view/js/ajaxupload.js
View File

0
js/crypto.js → view/js/crypto.js
View File

0
js/fk.autocomplete.js → view/js/fk.autocomplete.js
View File

0
js/icon_translate.js → view/js/icon_translate.js
View File

0
js/jquery-compat.js → view/js/jquery-compat.js vendored
View File

0
js/jquery-migrate-1.1.1.js → view/js/jquery-migrate-1.1.1.js
View File

0
js/jquery.htmlstream.js → view/js/jquery.htmlstream.js
View File

0
js/jquery.js → view/js/jquery.js vendored
View File

0
js/jquery.spin.js → view/js/jquery.spin.js
View File

0
js/jquery.textinputs.js → view/js/jquery.textinputs.js
View File

0
js/main.js → view/js/main.js
View File

0
js/spin.js → view/js/spin.js
View File

0
js/webtoolkit.base64.js → view/js/webtoolkit.base64.js
View File

22
view/php/theme_init.php
View File

@ -17,15 +17,15 @@ head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css'); head_add_css('view/css/widgets.css');
head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.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/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js'); head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('js/jquery-migrate-1.1.1.js'); head_add_js('jquery-migrate-1.1.1.js');
//head_add_js('js/jquery-compat.js'); //head_add_js('jquery-compat.js');
head_add_js('js/spin.js'); head_add_js('spin.js');
head_add_js('js/jquery.spin.js'); head_add_js('jquery.spin.js');
head_add_js('js/jquery.textinputs.js'); head_add_js('jquery.textinputs.js');
head_add_js('js/fk.autocomplete.js'); head_add_js('fk.autocomplete.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.js'); head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
head_add_js('library/jquery.timeago.js'); head_add_js('library/jquery.timeago.js');
head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.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/aes.js');
head_add_js('library/cryptojs/rollups/rabbit.js'); head_add_js('library/cryptojs/rollups/rabbit.js');
head_add_js('library/cryptojs/rollups/tripledes.js'); head_add_js('library/cryptojs/rollups/tripledes.js');
head_add_js('js/acl.js'); head_add_js('acl.js');
head_add_js('js/webtoolkit.base64.js'); head_add_js('webtoolkit.base64.js');
head_add_js('js/main.js'); head_add_js('main.js');
head_add_js('js/crypto.js'); head_add_js('crypto.js');
head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js'); head_add_js('docready.js');
head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');