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

fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self

Browse Source
This commit is contained in:
friendica 2014-02-05 15:56:18 -08:00
parent 8595318089
commit fdc0a7e95e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/items.php
View File

@ -2183,12 +2183,18 @@ function tag_deliver($uid,$item_id) {
if($terms && (! $i[0]['item_restrict'])) {
logger('tag_deliver: found bookmark');
if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && ($i[0]['author_xchan'] != $u[0]['channel_hash'])) {
$bookmark_self = intval(get_pconfig($uid,'system','bookmark_self'));
if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && (($i[0]['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) {
require_once('include/bookmarks.php');
require_once('include/Contact.php');
$s = channelx_by_hash($i[0]['author_xchan']);
foreach($terms as $t) {
bookmark_add($u[0],$s[0],$t,$i[0]['item_private']);
$s = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($item['author_xchan'])
);
if($s) {
foreach($terms as $t) {
bookmark_add($u[0],$s[0],$t,$i[0]['item_private']);
}
}
}
}