diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-06-04 10:19:04 +0200 |
| commit | e4ca3609d90bb437061e4b8db95ed0424b25eb76 (patch) | |
| tree | aa070e40ab01cb1354cbf879a0fb8b2f570631d5 /Zotlabs/Module/Like.php | |
| parent | 071fba2f7121aeb9690a21398935a53deac09af8 (diff) | |
| parent | bc092d8d7815195d62299c0ea54caa4759e6f2e7 (diff) | |
| download | volse-hubzilla-4.2.tar.gz volse-hubzilla-4.2.tar.bz2 volse-hubzilla-4.2.zip | |
Merge branch '4.2RC'4.2
Diffstat (limited to 'Zotlabs/Module/Like.php')
| -rw-r--r-- | Zotlabs/Module/Like.php | 6 |
1 files changed, 3 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) |