diff options
| author | git-marijus <mario@mariovavti.com> | 2017-07-31 02:47:24 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-07-31 02:47:24 +0200 |
| commit | 126e06b32ae7c442297173c38ad4fdda8473858d (patch) | |
| tree | a1ad76ebf44d406732141eed3ed97321a7463a62 | |
| parent | 988371be0b2df3f917da67f39814e21f96f9f957 (diff) | |
| parent | 964a02d68456912e08e76ec2bbfa1074e624cae7 (diff) | |
| download | volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.tar.gz volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.tar.bz2 volse-hubzilla-126e06b32ae7c442297173c38ad4fdda8473858d.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | include/feedutils.php | 13 | ||||
| -rw-r--r-- | include/markdown.php | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index eb24f9032..e3f899a1e 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1028,6 +1028,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { if(! $datarray['mid']) continue; + // This probably isn't an appropriate default but we're about to change it + // if it's wrong. + + $datarray['comment_policy'] = 'authenticated'; + // A Mastodon privacy tag has been found. We cannot send private comments // through the OStatus protocol, so block commenting. @@ -1256,6 +1261,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { if(! $datarray['mid']) continue; + // This probably isn't an appropriate default but we're about to change it + // if it's wrong. + + $datarray['comment_policy'] = 'authenticated'; + // A Mastodon privacy tag has been found. We cannot send private comments // through the OStatus protocol, so block commenting. @@ -1270,6 +1280,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { } + // if we have everything but a photo, provide the default profile photo if($author['author_name'] && $author['author_link'] && (! $author['author_photo'])) @@ -1493,7 +1504,7 @@ function process_salmon_feed($xml, $importer) { // reset policies which are restricted by default for RSS connections // This item is likely coming from GNU-social via salmon and allows public interaction $datarray['public_policy'] = ''; - $datarray['comment_policy'] = ''; + $datarray['comment_policy'] = 'authenticated'; $ret['item'] = $datarray; } diff --git a/include/markdown.php b/include/markdown.php index ccd108c1b..530af57a0 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -151,7 +151,7 @@ function bb_to_markdown_share($match) { -function bb_to_markdown($Text) { +function bb_to_markdown($Text, $options = []) { /* * Transform #tags, strip off the [url] and replace spaces with underscore @@ -168,9 +168,11 @@ function bb_to_markdown($Text) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text); + $x = [ 'bbcode' => $Text, 'options' => $options ]; - call_hooks('bb_to_markdown_bb',$Text); + call_hooks('bb_to_markdown_bb',$x); + $Text = $x['bbcode']; // Convert it to HTML - don't try oembed $Text = bbcode($Text, $preserve_nl, false); |