harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
git-marijus 2017-07-31 02:47:24 +02:00
commit 126e06b32a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/feedutils.php
View File

@ -1028,6 +1028,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid']) if(! $datarray['mid'])
continue; 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 // A Mastodon privacy tag has been found. We cannot send private comments
// through the OStatus protocol, so block commenting. // through the OStatus protocol, so block commenting.
@ -1256,6 +1261,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid']) if(! $datarray['mid'])
continue; 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 // A Mastodon privacy tag has been found. We cannot send private comments
// through the OStatus protocol, so block commenting. // 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 we have everything but a photo, provide the default profile photo
if($author['author_name'] && $author['author_link'] && (! $author['author_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 // reset policies which are restricted by default for RSS connections
// This item is likely coming from GNU-social via salmon and allows public interaction // This item is likely coming from GNU-social via salmon and allows public interaction
$datarray['public_policy'] = ''; $datarray['public_policy'] = '';
$datarray['comment_policy'] = ''; $datarray['comment_policy'] = 'authenticated';
$ret['item'] = $datarray; $ret['item'] = $datarray;
} }

6
include/markdown.php
View File

@ -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 * 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); $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 // Convert it to HTML - don't try oembed
$Text = bbcode($Text, $preserve_nl, false); $Text = bbcode($Text, $preserve_nl, false);