diff options
author | friendica <info@friendica.com> | 2015-02-02 14:59:01 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-02-02 14:59:01 -0800 |
commit | 043ff33e437451f6109e8d4cb5a2ce85cabcddec (patch) | |
tree | 2b68b9a392309e984b087c7c45ff1612efebedff | |
parent | e58bef049d7736d448f7bb5688affe491b9e24b1 (diff) | |
download | volse-hubzilla-043ff33e437451f6109e8d4cb5a2ce85cabcddec.tar.gz volse-hubzilla-043ff33e437451f6109e8d4cb5a2ce85cabcddec.tar.bz2 volse-hubzilla-043ff33e437451f6109e8d4cb5a2ce85cabcddec.zip |
issue #889 private tags for forums no longer recognised after tag refactor a few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality
-rwxr-xr-x | include/items.php | 1 | ||||
-rw-r--r-- | include/text.php | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index c34e694ac..0b2106572 100755 --- a/include/items.php +++ b/include/items.php @@ -4751,6 +4751,7 @@ function item_remove_cid($xchan_hash,$mid,$uid) { // Set item permissions based on results obtained from linkify_tags() function set_linkified_perms($linkified, &$str_contact_allow, &$str_group_allow, $profile_uid, $parent_item = false) { $first_access_tag = true; + foreach($linkified as $x) { $access_tag = $x['access_tag']; if(($access_tag) && (! $parent_item)) { diff --git a/include/text.php b/include/text.php index 13f3f2fdf..d19519779 100644 --- a/include/text.php +++ b/include/text.php @@ -2297,6 +2297,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { } } else { + // check for a group/collection exclusion tag // note that we aren't setting $replaced even though we're replacing text. @@ -2357,6 +2358,8 @@ function linkify_tags($a, &$body, $uid) { $tags = get_tags($body); if(count($tags)) { foreach($tags as $tag) { + $access_tag = ''; + // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. // Robert Johnson should be first in the $tags array |