diff options
| -rwxr-xr-x | include/items.php | 15 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 18aab93fa..5fcbb0cc5 100755 --- a/include/items.php +++ b/include/items.php @@ -2216,10 +2216,23 @@ function tag_deliver($uid,$item_id) { intval($item_id) ); + + // At this point we've determined that the person receiving this post was mentioned in it or it is a union. // Now let's check if this mention was inside a reshare so we don't spam a forum + // If it's private we may have to unobscure it momentarily so that we can parse it. + + $body = ''; + + if($item['item_flags'] & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + if($item['body']) + $body = aes_unencapsulate(json_decode_plus($item['body']),$key); + } + else + $body = $item['body']; - $body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); + $body = preg_replace('/\[share(.*?)\[\/share\]/','',$body); $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; diff --git a/mod/item.php b/mod/item.php index 218e9c174..2b8de1247 100644 --- a/mod/item.php +++ b/mod/item.php @@ -411,7 +411,7 @@ function item_post(&$a) { * owner from seeing it. This is because the permissions may not yet have been * set for the post. If it's private, the photo permissions should be set * appropriately. But we didn't know the final permissions on the post until - * now. So now we'll look for links of uploaded messages that are in the + * now. So now we'll look for links of uploaded photos and attachments that are in the * post and set them to the same permissions as the post itself. * */ diff --git a/version.inc b/version.inc index 3c41a6753..bd47e9407 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-03.486 +2013-11-04.487 |