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

fix superblock for comments

Browse Source
This commit is contained in:
friendica 2013-08-20 19:51:58 -07:00
parent cd5fdbcb48
commit 02a3694868
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ItemObject.php
View File

@ -39,10 +39,10 @@ class Item extends BaseObject {
foreach($data['children'] as $item) { foreach($data['children'] as $item) {
/* /*
* Only add thos that will be displayed * Only add those that will be displayed
*/ */
if(! visible_activity($item)) { if((! visible_activity($item)) || array_key_exists('author_blocked',$item)) {
continue; continue;
} }

14
include/conversation.php
View File

@ -712,6 +712,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$threads = array(); $threads = array();
foreach($items as $item) { foreach($items as $item) {
// Check for any blocked authors
if($arr_blocked) { if($arr_blocked) {
$blocked = false; $blocked = false;
foreach($arr_blocked as $b) { foreach($arr_blocked as $b) {
@ -724,6 +726,18 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
continue; continue;
} }
// Check all the kids too
if($arr_blocked && $item['children']) {
for($d = 0; $d < count($item['children']); $d ++) {
foreach($arr_blocked as $b) {
if(($b) && ($item['children'][$d]['author_xchan'] == $b))
$item['children'][$d]['author_blocked'] = true;
}
}
}
// Can we put this after the visibility check? // Can we put this after the visibility check?
like_puller($a,$item,$alike,'like'); like_puller($a,$item,$alike,'like');

2
version.inc
View File

@ -1 +1 @@
2013-08-19.410 2013-08-20.411