aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-14 09:09:48 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-14 09:09:48 +0200
commit15a000bb4554b0dee168eb595c9390a555c59f74 (patch)
tree017bdc6d275db69965b8b14140ae0768acfcbd6c
parent18e4a7ac6edbebcab1f147b84d940bfd2392d05f (diff)
downloadvolse-hubzilla-15a000bb4554b0dee168eb595c9390a555c59f74.tar.gz
volse-hubzilla-15a000bb4554b0dee168eb595c9390a555c59f74.tar.bz2
volse-hubzilla-15a000bb4554b0dee168eb595c9390a555c59f74.zip
add autocomplete js to calendar and fix issue with extended likes mid
-rw-r--r--Zotlabs/Module/Like.php6
-rw-r--r--view/js/mod_cdav.js4
2 files changed, 7 insertions, 3 deletions
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 3d1f503b6..052d51d43 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -491,7 +491,7 @@ class Like extends \Zotlabs\Web\Controller {
$arr['item_flags'] = $item_flags;
$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['author_xchan'] = $observer['xchan_hash'];
@@ -546,7 +546,7 @@ class Like extends \Zotlabs\Web\Controller {
dbesc($observer['xchan_hash']),
dbesc($ch[0]['channel_hash']),
intval($post_id),
- dbesc($mid),
+ dbesc($arr['mid']),
dbesc($activity),
dbesc(($tgttype)? $tgttype : $objtype),
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' ",
dbesc($observer['xchan_hash']),
dbesc($ch[0]['channel_hash']),
- dbesc($mid),
+ dbesc($arr['mid']),
dbesc($activity),
dbesc(($tgttype)? $tgttype : $objtype),
dbesc($obj_id)
diff --git a/view/js/mod_cdav.js b/view/js/mod_cdav.js
new file mode 100644
index 000000000..31ce87f7a
--- /dev/null
+++ b/view/js/mod_cdav.js
@@ -0,0 +1,4 @@
+$(document).ready(function() {
+ $('#id_description').editor_autocomplete(baseurl + "/acl");
+ $('textarea').bbco_autocomplete('bbcode');
+});