aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-03 22:09:16 -0700
committerzotlabs <mike@macgirvin.com>2017-09-03 22:09:16 -0700
commit3d0a7f4fc5eacbafa08f49118dc7e54927b4fbed (patch)
treea41c20770323cfcafc8cfdb55d71700f2ee2204d
parent47ef41695a3d30ca59ffb137745a7d3151b0df81 (diff)
downloadvolse-hubzilla-3d0a7f4fc5eacbafa08f49118dc7e54927b4fbed.tar.gz
volse-hubzilla-3d0a7f4fc5eacbafa08f49118dc7e54927b4fbed.tar.bz2
volse-hubzilla-3d0a7f4fc5eacbafa08f49118dc7e54927b4fbed.zip
paths in xchan_addr no longer means RSS specifically but could be activitypub
-rw-r--r--Zotlabs/Module/Acl.php2
-rw-r--r--include/html2bbcode.php3
2 files changed, 1 insertions, 4 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 4d7654f3d..9b2be0fea 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -352,7 +352,7 @@ class Acl extends \Zotlabs\Web\Controller {
"id" => $g['id'],
"xid" => $g['hash'],
"link" => $g['nick'],
- "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : t('RSS')),
+ "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']),
"self" => (intval($g['abook_self']) ? 'abook-self' : ''),
"taggable" => '',
"label" => '',
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 29880a627..d7fbd8660 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -87,9 +87,6 @@ function deletenode(&$doc, $node)
function html2bbcode($message)
{
- //$file = tempnam("/tmp/", "html");
- //file_put_contents($file, $message);
-
$message = str_replace("\r", "", $message);
$message = str_replace(array(