mirror of
https://github.com/friendica/friendica
synced 2024-12-23 06:00:15 +00:00
Basic forum support for Diaspora
This commit is contained in:
parent
5cae43c8c7
commit
9cbc4a7355
2 changed files with 4 additions and 2 deletions
|
@ -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",
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue