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

add autocomplete js to calendar and fix issue with extended likes mid

Browse Source
This commit is contained in:
Mario Vavti 2019-05-14 09:09:48 +02:00
parent 18e4a7ac6e
commit 15a000bb45
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Like.php
View File

@ -491,7 +491,7 @@ class Like extends \Zotlabs\Web\Controller {
$arr['item_flags'] = $item_flags; $arr['item_flags'] = $item_flags;
$arr['item_wall'] = $item_wall; $arr['item_wall'] = $item_wall;
$arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']); $arr['parent_mid'] = (($extended_like) ? $arr['mid'] : $item['mid']);
$arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']); $arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']);
$arr['author_xchan'] = $observer['xchan_hash']; $arr['author_xchan'] = $observer['xchan_hash'];
@ -546,7 +546,7 @@ class Like extends \Zotlabs\Web\Controller {
dbesc($observer['xchan_hash']), dbesc($observer['xchan_hash']),
dbesc($ch[0]['channel_hash']), dbesc($ch[0]['channel_hash']),
intval($post_id), intval($post_id),
dbesc($mid), dbesc($arr['mid']),
dbesc($activity), dbesc($activity),
dbesc(($tgttype)? $tgttype : $objtype), dbesc(($tgttype)? $tgttype : $objtype),
dbesc($obj_id), dbesc($obj_id),
@ -555,7 +555,7 @@ class Like extends \Zotlabs\Web\Controller {
$r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ", $r = q("select * from likes where liker = '%s' and likee = '%s' and i_mid = '%s' and verb = '%s' and target_type = '%s' and target_id = '%s' ",
dbesc($observer['xchan_hash']), dbesc($observer['xchan_hash']),
dbesc($ch[0]['channel_hash']), dbesc($ch[0]['channel_hash']),
dbesc($mid), dbesc($arr['mid']),
dbesc($activity), dbesc($activity),
dbesc(($tgttype)? $tgttype : $objtype), dbesc(($tgttype)? $tgttype : $objtype),
dbesc($obj_id) dbesc($obj_id)

4
view/js/mod_cdav.js Normal file
View File

@ -0,0 +1,4 @@
$(document).ready(function() {
$('#id_description').editor_autocomplete(baseurl + "/acl");
$('textarea').bbco_autocomplete('bbcode');
});