aboutsummaryrefslogtreecommitdiffstats
path: root/include/taxonomy.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-05 15:58:28 -0800
committerzotlabs <mike@macgirvin.com>2018-02-05 15:58:28 -0800
commitb41c5f349715abc6ca7db563e3938336bc75974e (patch)
tree31a1ee5a74227c30239bb9d2a10341bbacb8ecec /include/taxonomy.php
parent05de59d4ad174cb106c3a5b5890732af51730384 (diff)
parent930e1fdbdc798868760f8a4e03f32fc3f42e8bc9 (diff)
downloadvolse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.tar.gz
volse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.tar.bz2
volse-hubzilla-b41c5f349715abc6ca7db563e3938336bc75974e.zip
Merge branch 'master' into z6
Diffstat (limited to 'include/taxonomy.php')
-rw-r--r--include/taxonomy.php22
1 files changed, 4 insertions, 18 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 278925391..393b8718e 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -313,39 +313,25 @@ function dir_tagadelic($count = 0, $hub = '') {
$count = intval($count);
- $dirmode = get_config('system','directory_mode');
-
- if(($dirmode == DIRECTORY_MODE_STANDALONE) && (! $hub)) {
- $hub = \App::get_hostname();
- }
-
- if($hub)
- $hub_query = " and xtag_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') ";
- else
- $hub_query = '';
-
- if($hub_query) {
- // Fetch tags
+ if($hub) {
$r = q("select xtag_term as term, count(xtag_term) as total from xtag
left join hubloc on xtag_hash = hubloc_hash
- where xtag_flags = 0 $hub_query
+ where xtag_flags = 0 and xtag_hash in (select hubloc_hash from hubloc where hubloc_host = '%s' )
group by xtag_term order by total desc %s",
+ dbesc($hub),
((intval($count)) ? "limit $count" : '')
);
}
else {
- // Fetch tags
$r = q("select xtag_term as term, count(xtag_term) as total from xtag where xtag_flags = 0
group by xtag_term order by total desc %s",
((intval($count)) ? "limit $count" : '')
);
}
if(! $r)
- return array();
-
+ return [];
return Zotlabs\Text\Tagadelic::calc($r);
-
}