diff options
| -rwxr-xr-x | include/items.php | 21 | ||||
| -rw-r--r-- | include/permissions.php | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/include/items.php b/include/items.php index de20cf83a..4c7854bdf 100755 --- a/include/items.php +++ b/include/items.php @@ -2303,27 +2303,6 @@ function tag_deliver($uid,$item_id) { $item = $i[0]; - - $terms = get_terms_oftype($item['term'],TERM_BOOKMARK); - - if($terms && (! $item['item_restrict'])) { - logger('tag_deliver: found bookmark'); - $bookmark_self = intval(get_pconfig($uid,'system','bookmark_self')); - if(perm_is_allowed($u[0]['channel_id'],$item['author_xchan'],'bookmark') && (($item['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) { - require_once('include/bookmarks.php'); - require_once('include/Contact.php'); - - $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,$item['item_private']); - } - } - } - } - if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK) && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) { // this is an update to a post which was already processed by us and has a second delivery chain // Just start the second delivery chain to deliver the updated post diff --git a/include/permissions.php b/include/permissions.php index 01dd18f8d..029bc1288 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -29,7 +29,7 @@ function get_perms() { 'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my "public" pages'), ''), 'republish' => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my "public" posts in derived channels'), t('Somewhat advanced - very useful in open communities')), - 'bookmark' => array('channel_a_bookmark', intval(PERMS_A_BOOKMARK), false, t('Can send me bookmarks'), 'Bookmarks from this person will automatically be saved'), + 'delegate' => array('channel_a_delegate', intval(PERMS_A_DELEGATE), false, t('Can administer my channel resources'), t('Extremely advanced. Leave this alone unless you know what you are doing')), ); $ret = array('global_permissions' => $global_perms); |