Merge pull request #2682 from annando/1607-api-generic-xml

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 01aae691b638bd900d92578c09b3c50321dbaf0d..c22813922bee6fcc8965802ed26e5bfb07e11ac1 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -408,23 +408,28 @@ function bb_ShareAttributes($share, $simplehtml) {
        if ($itemcache == "")
                $reldate = (($posted) ? " " . relative_date($posted) : '');
 
+       // We only call this so that a previously unknown contact can be added.
+       // This is important for the function "get_contact_details_by_url".
+       // This function then can fetch an entry from the contact table.
+       get_contact($profile, 0);
+
        $data = get_contact_details_by_url($profile);
 
-       if (isset($data["name"]) AND isset($data["addr"]))
+       if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != ""))
                $userid_compact = $data["name"]." (".$data["addr"].")";
        else
                $userid_compact = GetProfileUsername($profile,$author, true);
 
-       if (isset($data["addr"]))
+       if (isset($data["addr"]) AND ($data["addr"] != ""))
                $userid = $data["addr"];
        else
                $userid = GetProfileUsername($profile,$author, false);
 
-       if (isset($data["name"]))
+       if (isset($data["name"]) AND ($data["name"] != ""))
                $author = $data["name"];
 
-       if (isset($data["photo"]))
-               $avatar = $data["photo"];
+       if (isset($data["micro"]) AND ($data["micro"] != ""))
+               $avatar = $data["micro"];
 
        $preshare = trim($share[1]);
 
@@ -490,6 +495,8 @@ function bb_ShareAttributes($share, $simplehtml) {
                default:
                        $text = trim($share[1])."\n";
 
+                       $avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
+
                        $tpl = get_markup_template('shared_content.tpl');
                        $text .= replace_macros($tpl,
                                        array(
@@ -1133,6 +1140,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/ism",'',$Text);
                $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text);
+               $Text = preg_replace("/\[event\-id\](.*?)\[\/event\-id\]/ism",'',$Text);
        }