aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bb2diaspora.php10
-rw-r--r--include/delivery.php2
-rw-r--r--include/notifier.php3
3 files changed, 9 insertions, 6 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 65ccc750f..ca0c961b3 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -62,9 +62,9 @@ function bb2diaspora($Text,$preserve_nl = false) {
// [img]pathtoimage[/img]
- $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text);
- $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text);
- $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text);
+ $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text);
+ $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text);
+ $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text);
// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text);
// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text);
@@ -165,7 +165,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
// oembed tag
-// $Text = oembed_bbcode2html($Text);
+ // $Text = oembed_bbcode2html($Text);
// If we found an event earlier, strip out all the event code and replace with a reformatted version.
@@ -189,8 +189,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
function format_event_diaspora($ev) {
-// require_once('include/bbcode.php');
-
if(! ((is_array($ev)) && count($ev)))
return '';
diff --git a/include/delivery.php b/include/delivery.php
index 5d81228ee..7f45fb2fa 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -140,6 +140,8 @@ function delivery_run($argv, $argc){
$owner = $r[0];
+ $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+
$public_message = true;
// fill this in with a single salmon slap if applicable
diff --git a/include/notifier.php b/include/notifier.php
index 8d2aa961c..0bb82b7bf 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -129,6 +129,7 @@ function notifier_run($argv, $argc){
logger('notifier: top level post');
$top_level = true;
}
+
}
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
@@ -144,6 +145,8 @@ function notifier_run($argv, $argc){
$owner = $r[0];
+ $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+
$hub = get_config('system','huburl');
// If this is a public conversation, notify the feed hub