aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-26 17:35:41 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-26 17:35:41 -0800
commitfa5a382c4b4f8cde8091c4b067a6d9ec9f47a45c (patch)
tree4e05fe1bb86adcbcd670aaa16c9b61acb269c8cc
parenta73c3858318f0efe54dacd585d76e272041fba32 (diff)
downloadvolse-hubzilla-fa5a382c4b4f8cde8091c4b067a6d9ec9f47a45c.tar.gz
volse-hubzilla-fa5a382c4b4f8cde8091c4b067a6d9ec9f47a45c.tar.bz2
volse-hubzilla-fa5a382c4b4f8cde8091c4b067a6d9ec9f47a45c.zip
don't show item_delayed_publish items in tag clouds
-rw-r--r--include/taxonomy.php4
-rw-r--r--include/zot.php3
2 files changed, 3 insertions, 4 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php
index b396d53f1..0bf89a7c1 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -117,6 +117,8 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
if(! perm_is_allowed($uid,get_observer_hash(),'view_stream'))
return array();
+
+ $item_normal = item_normal();
$sql_options = item_permissions_sql($uid);
$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
where term.uid = %d and term.type = %d
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",
intval($uid),
intval($type),
diff --git a/include/zot.php b/include/zot.php
index 2366c1d2d..c0d537eb9 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3951,9 +3951,6 @@ function delivery_report_is_storable($dr) {
return false;
-
-
-
// is the recipient one of our connections, or do we want to store every report?
$r = explode(' ', $dr['recipient']);