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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-09-19 10:26:06 +02:00
commit 105e7626fc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Daemon/Notifier.php
View File

@ -59,6 +59,8 @@ require_once('include/bbcode.php');
* *
* ZOT * ZOT
* permission_create abook_id * permission_create abook_id
* permission_accept abook_id
* permission_reject abook_id
* permission_update abook_id * permission_update abook_id
* refresh_all channel_id * refresh_all channel_id
* purge_all channel_id * purge_all channel_id
@ -171,8 +173,12 @@ class Notifier {
if($channel) { if($channel) {
$perm_update = array('sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => ''); $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); 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 else
call_hooks('permissions_update',$perm_update); call_hooks('permissions_update',$perm_update);

7
include/feedutils.php
View File

@ -811,6 +811,7 @@ function feed_get_reshare(&$res,$item) {
} }
$attach = $share['links']; $attach = $share['links'];
if($attach) { if($attach) {
foreach($attach as $att) { foreach($attach as $att) {
if($att['rel'] === 'alternate') { 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']) . $res['body'] = "[share author='" . urlencode($share['author']) .
"' profile='" . $share['profile'] . "' profile='" . $share['profile'] .
"' avatar='" . $share['avatar'] . "' avatar='" . $share['avatar'] .
@ -1706,7 +1711,7 @@ function compat_photos_list($s) {
$found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER); $found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER);
if($found) { if($found) {
foreach($matches as $match) { foreach($matches as $match) {
$ret[] = [ $ret[] = [
'href' => $match[2], 'href' => $match[2],
'length' => 0, 'length' => 0,