Markdown is now supported in the location field as well.

diff --git a/include/diaspora.php b/include/diaspora.php
index b5cb0f0e2364481de873e99eccf16aace9beda7c..45feee87b5ed475fc11768e632869d268d7e85fd 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2161,7 +2161,7 @@ function diaspora_profile($importer,$xml,$msg) {
        $name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : '');
        $image_url = unxmlify($xml->image_url);
        $birthday = unxmlify($xml->birthday);
-       $location = unxmlify($xml->location);
+       $location = diaspora2bb(unxmlify($xml->location));
        $about = diaspora2bb(unxmlify($xml->bio));
 
 

diff --git a/mod/display.php b/mod/display.php
index 3cc6761a4cff906eddb46450d5183607ec4e8615..9735ba921f6b57a8daf36fe974ab02fc9975a6bb 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -94,7 +94,7 @@ function display_fetchauthor($a, $item) {
                normalise_link($profiledata["url"]), $item["uid"]);
        if (count($r)) {
                $profiledata["photo"] = proxy_url($r[0]["photo"]);
-               $profiledata["address"] = $r[0]["location"];
+               $profiledata["address"] = bbcode($r[0]["location"]);
                $profiledata["about"] = bbcode($r[0]["about"]);
                if ($r[0]["nick"] != "")
                        $profiledata["nickname"] = $r[0]["nick"];