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

private tagged posts weren't creating second delivery chain - they were incorrectly being marked as "in a reshare" due to being obscured.

Browse Source
This commit is contained in:
friendica 2013-11-04 16:44:23 -08:00
parent d783183572
commit c61a0d9dab
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/items.php
View File

@ -2216,10 +2216,23 @@ function tag_deliver($uid,$item_id) {
intval($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. // 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 // 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 = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']); $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\]/','',$body);
$pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/'; $pattern = '/@\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';

2
mod/item.php
View File

@ -411,7 +411,7 @@ function item_post(&$a) {
* owner from seeing it. This is because the permissions may not yet have been * 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 * 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 * 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. * post and set them to the same permissions as the post itself.
* *
*/ */

2
version.inc
View File

@ -1 +1 @@
2013-11-03.486 2013-11-04.487