aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/bb2diaspora.php8
-rw-r--r--include/contact_selectors.php2
-rw-r--r--include/items.php4
3 files changed, 8 insertions, 6 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 262b61ac0..6b0589c43 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -6,6 +6,11 @@ require_once('include/event.php');
require_once('library/markdown.php');
require_once('include/html2bbcode.php');
+// we don't want to support a bbcode specific markdown interpreter
+// and the markdown library we have is pretty good, but provides HTML output.
+// So we'll use that to convert to HTML, then convert the HTML back to bbcode,
+// and then clean up a few Diaspora specific constructs.
+
function diaspora2bb($s) {
$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
@@ -57,8 +62,6 @@ function stripdcode_br_cb($s) {
}
- // BBcode 2 HTML was written by WAY2WEB.net
- // extended to work with Mistpark/Friendika - Mike Macgirvin
function bb2diaspora($Text,$preserve_nl = false) {
@@ -95,7 +98,6 @@ function bb2diaspora($Text,$preserve_nl = false) {
$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);
// Perform MAIL Search
$Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text);
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 1303acf74..474902704 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -75,6 +75,6 @@ function network_to_name($s) {
call_hooks('network_to_name', $s);
return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT),
- array(t('Friendika'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s);
+ array(t('Friendica'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s);
}
diff --git a/include/items.php b/include/items.php
index 2af2b5f55..35db71946 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1671,9 +1671,9 @@ function local_delivery($importer,$data) {
// Does our member already have a friend matching this description?
- $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc($fsugg['name']),
- dbesc($fsugg['url']),
+ dbesc(normalise_link($fsugg['url'])),
intval($fsugg['uid'])
);
if(count($r))