aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-03-03 08:49:18 +0000
committerMario <mario@mariovavti.com>2023-03-03 08:49:18 +0000
commitec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f (patch)
tree2a5c739bf8c06297c64776a0f83374f17b288c56 /Zotlabs/Module
parentda034045cc1bba74287b7c3e83f4a94ff5359150 (diff)
downloadvolse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.tar.gz
volse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.tar.bz2
volse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.zip
Revert "some work on bringing bang tags back for forums"
This reverts commit da034045cc1bba74287b7c3e83f4a94ff5359150.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Acl.php12
-rw-r--r--Zotlabs/Module/Item.php1
2 files changed, 5 insertions, 8 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index e7a1e6706..b98f5621e 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -69,7 +69,6 @@ class Acl extends \Zotlabs\Web\Controller {
$sql_extra = '';
$sql_extra2 = '';
$sql_extra3 = '';
- $sql_extra4 = (($type === 'f') ? ' AND xchan_pubforum = 1 ' : '');
$sql_extra2_xchan = '';
$order_extra2 = '';
@@ -220,7 +219,7 @@ class Acl extends \Zotlabs\Web\Controller {
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, xchan_pubforum, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 $sql_extra4 order by $order_extra2 xchan_name asc" ,
+ WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
intval(local_channel())
);
@@ -338,7 +337,6 @@ class Acl extends \Zotlabs\Web\Controller {
else
$r = array();
-
if($r) {
$i = count($contacts);
$x = [];
@@ -369,12 +367,10 @@ class Acl extends \Zotlabs\Web\Controller {
"nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
"self" => (intval($g['abook_self']) ? 'abook-self' : ''),
"taggable" => 'taggable',
- "label" => t('network'),
- "net" => $g['net'] ?? ''
-
+ "label" => t('network')
);
}
- //if($type !== 'f') {
+ if($type !== 'f') {
if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && $g['net'] == 'zot6')) {
$contacts[$x[$lkey]] = array(
"type" => "c",
@@ -391,7 +387,7 @@ class Acl extends \Zotlabs\Web\Controller {
"net" => $g['net'] ?? ''
);
}
- //}
+ }
$i++;
}
}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 0643cc447..27fc62ee6 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -840,6 +840,7 @@ class Item extends Controller {
// Look for tags and linkify them
$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
+
if ($results) {
// Set permissions based on tag replacements