aboutsummaryrefslogtreecommitdiffstats
path: root/include/taxonomy.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-11 08:46:13 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-11 08:46:13 +0100
commit61e019e176f6d66f2ebdd0db4555fb727a7958ff (patch)
treea61bda7937e73cf7f8649fa0be62f9e9097704ad /include/taxonomy.php
parent46cc360e4e099d0ef91e06833525796f42f1343b (diff)
parent894b3706e7e10fbcd158f4022f68ed23c1c7defa (diff)
downloadvolse-hubzilla-61e019e176f6d66f2ebdd0db4555fb727a7958ff.tar.gz
volse-hubzilla-61e019e176f6d66f2ebdd0db4555fb727a7958ff.tar.bz2
volse-hubzilla-61e019e176f6d66f2ebdd0db4555fb727a7958ff.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/taxonomy.php')
-rw-r--r--include/taxonomy.php19
1 files changed, 12 insertions, 7 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php
index a646df28c..278925391 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -309,19 +309,27 @@ function article_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags
-function dir_tagadelic($count = 0) {
+function dir_tagadelic($count = 0, $hub = '') {
$count = intval($count);
$dirmode = get_config('system','directory_mode');
- if($dirmode == DIRECTORY_MODE_STANDALONE) {
+ 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
$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 and hubloc_url = '%s'
+ where xtag_flags = 0 $hub_query
group by xtag_term order by total desc %s",
- dbesc(z_root()),
((intval($count)) ? "limit $count" : '')
);
}
@@ -485,9 +493,6 @@ function dir_tagblock($link,$r) {
$o = '';
$observer = get_observer_hash();
- if(! get_directory_setting($observer, 'globaldir'))
- return $o;
-
if(! $r)
$r = App::$data['directory_keywords'];