clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Markdown is now supported in the location field as well.

This commit is contained in:
Michael Vogel 2015-01-08 00:13:43 +01:00
parent e7e3857f5c
commit 044eaa778f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/diaspora.php
View File

@ -2161,7 +2161,7 @@ function diaspora_profile($importer,$xml,$msg) {
$name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : ''); $name = unxmlify($xml->first_name) . ((strlen($xml->last_name)) ? ' ' . unxmlify($xml->last_name) : '');
$image_url = unxmlify($xml->image_url); $image_url = unxmlify($xml->image_url);
$birthday = unxmlify($xml->birthday); $birthday = unxmlify($xml->birthday);
$location = unxmlify($xml->location); $location = diaspora2bb(unxmlify($xml->location));
$about = diaspora2bb(unxmlify($xml->bio)); $about = diaspora2bb(unxmlify($xml->bio));

2
mod/display.php
View File

@ -94,7 +94,7 @@ function display_fetchauthor($a, $item) {
normalise_link($profiledata["url"]), $item["uid"]); normalise_link($profiledata["url"]), $item["uid"]);
if (count($r)) { if (count($r)) {
$profiledata["photo"] = proxy_url($r[0]["photo"]); $profiledata["photo"] = proxy_url($r[0]["photo"]);
$profiledata["address"] = $r[0]["location"]; $profiledata["address"] = bbcode($r[0]["location"]);
$profiledata["about"] = bbcode($r[0]["about"]); $profiledata["about"] = bbcode($r[0]["about"]);
if ($r[0]["nick"] != "") if ($r[0]["nick"] != "")
$profiledata["nickname"] = $r[0]["nick"]; $profiledata["nickname"] = $r[0]["nick"];