GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Prefill profile roles when checking scope

Browse Source
This commit is contained in:
Evan Prodromou
2012-03-21 13:51:17 -04:00
parent b1555fe373
commit 4ea9a0a7e8
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/noticelist.php
View File

@@ -151,20 +151,6 @@ class NoticeList extends Widget
Memcached_DataObject::pivotGet('Notice', 'repeat_of', $ids, array('profile_id' => $p->id)); Memcached_DataObject::pivotGet('Notice', 'repeat_of', $ids, array('profile_id' => $p->id));
} }
if (common_config('notice', 'hidespam')) {
$pids = array();
foreach ($profiles as $profile) {
$pids[] = $profile->id;
}
Memcached_DataObject::pivotGet('Profile_role',
'profile_id',
$pids,
array('role' => Profile_role::SILENCED));
}
Event::handle('EndNoticeListPrefill', array(&$notices, &$profiles, $avatarSize)); Event::handle('EndNoticeListPrefill', array(&$notices, &$profiles, $avatarSize));
} }
} }

14
lib/scopingnoticestream.php
View File

@@ -80,5 +80,19 @@ class ScopingNoticeStream extends FilteringNoticeStream
Notice::fillGroups($notices); Notice::fillGroups($notices);
Notice::fillReplies($notices); Notice::fillReplies($notices);
if (common_config('notice', 'hidespam')) {
$profiles = Notice::getProfiles($notices);
foreach ($profiles as $profile) {
$pids[] = $profile->id;
}
Memcached_DataObject::pivotGet('Profile_role',
'profile_id',
$pids,
array('role' => Profile_role::SILENCED));
}
} }
} }