bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #4360 from annando/diaspora-forum

Browse source 
Basic forum support for Diaspora
This commit is contained in:
Hypolite Petovan 2018-01-30 08:55:47 -05:00 committed by GitHub
parent c9edbd0b55 9cbc4a7355
commit c0b8685343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/bbcode.php
View file

@ -997,8 +997,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, [3, 7])) {
$Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
} elseif ($simplehtml == 3) {
// The ! is converted to @ since Diaspora only understands the @
$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1<a href="$2">$3</a>',
'@<a href="$2">$3</a>',
$Text);
} elseif ($simplehtml == 7) {
$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",

3
src/Worker/Delivery.php
View file

@ -133,7 +133,8 @@ class Delivery {
return;
}
$walltowall = (($top_level && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
$public_message = true;