Merge pull request #2685 from annando/1607-poller-information

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 46e34a1fd505467dcd2021a39489751978e0f8f3..c22813922bee6fcc8965802ed26e5bfb07e11ac1 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -415,20 +415,20 @@ function bb_ShareAttributes($share, $simplehtml) {
 
        $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["micro"]))
+       if (isset($data["micro"]) AND ($data["micro"] != ""))
                $avatar = $data["micro"];
 
        $preshare = trim($share[1]);
@@ -1140,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);
        }