diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-28 16:26:24 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-28 16:26:24 +0100 |
| commit | 17907f11a350536bbcac248e6b81b63eecee964d (patch) | |
| tree | 93f8413b78c6fb12fde059ecc8f8831e9996731a /include/taxonomy.php | |
| parent | cb7df797e1d5a87ff8b6dbb6c07faf68e3e725f7 (diff) | |
| parent | 122d7281f7d4b55ef8adf8791bdab51b4b797ba8 (diff) | |
| download | volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.tar.gz volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.tar.bz2 volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
include/datetime.php
include/text.php
mod/events.php
version.inc
view/css/mod_events.css
view/theme/redbasic/css/style.css
view/tpl/event_head.tpl
view/tpl/events-js.tpl
view/tpl/jot.tpl
Diffstat (limited to 'include/taxonomy.php')
| -rw-r--r-- | include/taxonomy.php | 4 |
1 files changed, 3 insertions, 1 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), |