aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-10-12 11:25:44 +0000
committerMario <mario@mariovavti.com>2021-10-12 11:25:44 +0000
commit3e503ec3a35e4226a566c1986bf570afc7c8a53f (patch)
tree36ac7c4941af669010e7684f77324be24b610bee /Zotlabs
parente455fae334c4b5f8d5a563e099add1482749c92f (diff)
downloadvolse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.tar.gz
volse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.tar.bz2
volse-hubzilla-3e503ec3a35e4226a566c1986bf570afc7c8a53f.zip
Revert "httpsig: add parentheses"
This reverts commit e455fae334c4b5f8d5a563e099add1482749c92f.
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Notes.php11
-rw-r--r--Zotlabs/Web/HTTPSig.php4
-rw-r--r--Zotlabs/Widget/Notes.php1
3 files changed, 3 insertions, 13 deletions
diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php
index 57b8f30db..6e8e03f20 100644
--- a/Zotlabs/Module/Notes.php
+++ b/Zotlabs/Module/Notes.php
@@ -19,12 +19,7 @@ class Notes extends Controller {
if(! Apps::system_app_installed(local_channel(), 'Notes'))
return EMPTY_STR;
- $ret = [
- 'success' => false,
- 'html' => ''
- ];
-
-
+ $ret = array('success' => true);
if(array_key_exists('note_text',$_REQUEST)) {
$body = escape_tags($_REQUEST['note_text']);
@@ -38,10 +33,6 @@ class Notes extends Controller {
set_pconfig(local_channel(),'notes','text.bak',$old_text);
}
set_pconfig(local_channel(),'notes','text',$body);
-
- $ret['html'] = bbcode($body);
- $ret['success'] = true;
-
}
// push updates to channel clones
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index ad10fa182..5aa1e1913 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -323,7 +323,7 @@ class HTTPSig {
static function get_webfinger_key($id, $force = false) {
if (!$force) {
- $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc",
+ $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc",
dbesc(str_replace('acct:', '', $id)),
dbesc($id)
);
@@ -370,7 +370,7 @@ class HTTPSig {
static function get_zotfinger_key($id, $force = false) {
if (!$force) {
- $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network = 'zot6' order by hubloc_id desc",
+ $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc",
dbesc(str_replace('acct:', '', $id)),
dbesc($id)
);
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 66c90ef7d..05c1a0292 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -20,7 +20,6 @@ class Notes {
$o = replace_macros($tpl, array(
'$banner' => t('Notes'),
'$text' => $text,
- '$html' => bbcode($text),
'$save' => t('Save'),
'$app' => ((isset($arr['app'])) ? true : false),
'$hidden' => ((isset($arr['hidden'])) ? true : false)