diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-19 10:26:06 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-19 10:26:06 +0200 |
| commit | 105e7626fc2686c3d838e72350244408c439a9e8 (patch) | |
| tree | 69a93520d981f86f07e9da318ca2fbbc5d9f028a | |
| parent | c3b3f41a21a5b56315768dbddc366934d6374c96 (diff) | |
| parent | c6bcea0f82a03657611621c338a6c01059ae8ec6 (diff) | |
| download | volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.tar.gz volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.tar.bz2 volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 8 | ||||
| -rw-r--r-- | include/feedutils.php | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 0e8c99572..1b8a7d412 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -59,6 +59,8 @@ require_once('include/bbcode.php'); * * ZOT * permission_create abook_id + * permission_accept abook_id + * permission_reject abook_id * permission_update abook_id * refresh_all channel_id * purge_all channel_id @@ -171,8 +173,12 @@ class Notifier { if($channel) { $perm_update = array('sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => ''); - if($cmd == 'permission_create') + if($cmd === 'permission_create') call_hooks('permissions_create',$perm_update); + elseif($cmd === 'permission_accept') + call_hooks('permissions_accept',$perm_update); + elseif($cmd === 'permission_reject') + call_hooks('permissions_reject',$perm_update); else call_hooks('permissions_update',$perm_update); diff --git a/include/feedutils.php b/include/feedutils.php index 145d4361c..112e10155 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -811,6 +811,7 @@ function feed_get_reshare(&$res,$item) { } $attach = $share['links']; + if($attach) { foreach($attach as $att) { if($att['rel'] === 'alternate') { @@ -845,6 +846,10 @@ function feed_get_reshare(&$res,$item) { } } + if((! $body) && ($share['alternate'])) { + $body = $share['alternate']; + } + $res['body'] = "[share author='" . urlencode($share['author']) . "' profile='" . $share['profile'] . "' avatar='" . $share['avatar'] . @@ -1706,7 +1711,7 @@ function compat_photos_list($s) { $found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER); if($found) { - foreach($matches as $match) { + foreach($matches as $match) { $ret[] = [ 'href' => $match[2], 'length' => 0, |