aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-18 13:20:23 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-18 13:20:23 +0100
commita0e1a8e0a20df640ef951dee4fb3c6ed19faee03 (patch)
tree672bdd787b969c495d2a279da14c0781adb89a29 /include
parenta486c906863a59c0ebed80192b2c0e9aeb111f12 (diff)
parenteb86ffefbfb38cf76316940a6aa164530f9b9348 (diff)
downloadvolse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.tar.gz
volse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.tar.bz2
volse-hubzilla-a0e1a8e0a20df640ef951dee4fb3c6ed19faee03.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/import.php3
-rw-r--r--include/taxonomy.php22
-rw-r--r--include/zid.php14
3 files changed, 16 insertions, 23 deletions
diff --git a/include/import.php b/include/import.php
index 51791347a..9920df8be 100644
--- a/include/import.php
+++ b/include/import.php
@@ -82,7 +82,8 @@ function import_channel($channel, $account_id, $seize) {
'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall',
'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall',
'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish',
- 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt'
+ 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt',
+ 'channel_moved'
];
$clean = array();
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);
-
}
diff --git a/include/zid.php b/include/zid.php
index 6ebc9a6ab..b3a7d1e6a 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -127,8 +127,11 @@ function clean_query_string($s = '') {
* @return string
*/
function zidify_callback($match) {
- $is_zid = ((feature_enabled(local_channel(), 'sendzid')) || (strpos($match[1], 'zrl')) ? true : false);
- $replace = '<a' . $match[1] . ' href="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
+
+ $arr = [ 'zid' => ((strpos($match[1],'zrl')) ? true : false), 'url' => $match[2] ];
+ call_hooks('zidify', $arr);
+
+ $replace = '<a' . $match[1] . ' href="' . (intval($arr['zid']) ? zid($arr['url']) : $arr['url']) . '"';
$x = str_replace($match[0], $replace, $match[0]);
@@ -136,8 +139,11 @@ function zidify_callback($match) {
}
function zidify_img_callback($match) {
- $is_zid = ((feature_enabled(local_channel(), 'sendzid')) || (strpos($match[1], 'zrl')) ? true : false);
- $replace = '<img' . $match[1] . ' src="' . (($is_zid) ? zid($match[2]) : $match[2]) . '"';
+
+ $arr = [ 'zid' => ((strpos($match[1],'zrl')) ? true : false), 'url' => $match[2] ];
+ call_hooks('zidify', $arr);
+
+ $replace = '<img' . $match[1] . ' src="' . (intval($arr['zid']) ? zid($arr['url']) : $arr['url']) . '"';
$x = str_replace($match[0], $replace, $match[0]);