aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-07-30 23:07:33 +0200
committerMario <mario@mariovavti.com>2019-07-30 23:07:33 +0200
commit32874b89ca0179be561b8d85796be46188c851cb (patch)
tree955ad9f7a56c742d660e170e64a292622a08e3ea
parent5695350e98a8a2c802ff419c5b29b0f01f0180df (diff)
parentfeea137dbfb807278a3b922396332b867f123049 (diff)
downloadvolse-hubzilla-32874b89ca0179be561b8d85796be46188c851cb.tar.gz
volse-hubzilla-32874b89ca0179be561b8d85796be46188c851cb.tar.bz2
volse-hubzilla-32874b89ca0179be561b8d85796be46188c851cb.zip
Merge branch 'dev' into 'dev'
fix urls on imported item taxonomy See merge request hubzilla/core!1695
-rw-r--r--Zotlabs/Module/Group.php2
-rw-r--r--include/text.php9
2 files changed, 10 insertions, 1 deletions
diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
index 12edf8428..f836978ee 100644
--- a/Zotlabs/Module/Group.php
+++ b/Zotlabs/Module/Group.php
@@ -177,7 +177,7 @@ class Group extends Controller {
if($r)
$result = group_rmv(local_channel(),$r[0]['gname']);
if($result) {
- $hookinfo = [ 'pgrp_extras' => '', 'group'=>$argv(2) ];
+ $hookinfo = [ 'pgrp_extras' => '', 'group' => argv(2) ];
call_hooks ('privacygroup_extras_drop',$hookinfo);
info( t('Privacy group removed.') . EOL);
}
diff --git a/include/text.php b/include/text.php
index 8adcc1269..572b43916 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3107,6 +3107,15 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') {
if($oldnick)
$item['llink'] = str_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['llink']);
+ if($item['term']) {
+ for($x = 0; $x < count($item['term']); $x ++) {
+ $item['term'][$x]['url'] = str_replace($old,$new,$item['term'][$x]['url']);
+ if ($oldnick) {
+ $item['term'][$x]['url'] = str_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['term'][$x]['url']);
+ }
+ }
+ }
+
}