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

don't show item_delayed_publish items in tag clouds

Browse Source
This commit is contained in:
redmatrix 2015-11-26 17:35:41 -08:00
parent a73c385831
commit fa5a382c4b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/taxonomy.php
View File

@ -117,6 +117,8 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
if(! perm_is_allowed($uid,get_observer_hash(),'view_stream')) if(! perm_is_allowed($uid,get_observer_hash(),'view_stream'))
return array(); return array();
$item_normal = item_normal();
$sql_options = item_permissions_sql($uid); $sql_options = item_permissions_sql($uid);
$count = intval($count); $count = intval($count);
@ -142,7 +144,7 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
$r = q("select term, count(term) as total from term left join item on term.oid = item.id $r = q("select term, count(term) as total from term left join item on term.oid = item.id
where term.uid = %d and term.type = %d where term.uid = %d and term.type = %d
and otype = %d and item_type = %d and item_private = 0 and otype = %d and item_type = %d and item_private = 0
$sql_options $sql_options $item_normal
group by term order by total desc %s", group by term order by total desc %s",
intval($uid), intval($uid),
intval($type), intval($type),

3
include/zot.php
View File

@ -3951,9 +3951,6 @@ function delivery_report_is_storable($dr) {
return false; return false;
// is the recipient one of our connections, or do we want to store every report? // is the recipient one of our connections, or do we want to store every report?
$r = explode(' ', $dr['recipient']); $r = explode(' ', $dr['recipient']);