diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
| commit | 3b9b03cf86979b28e7fa249133176bed84b0105c (patch) | |
| tree | 336dc8b8b9627e7f4a93e5c35fe3e98555274616 /include/Import/import_diaspora.php | |
| parent | 2e5a993f880d619aedf3693927e7b3e164fbfcc0 (diff) | |
| parent | ef39c1e94b5149a3019d417d08dc7c16c8aef9c1 (diff) | |
| download | volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.gz volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.bz2 volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.zip | |
Merge branch '2.0RC'
Diffstat (limited to 'include/Import/import_diaspora.php')
| -rw-r--r-- | include/Import/import_diaspora.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index b664badf1..c6dae0117 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -89,7 +89,7 @@ function import_diaspora($data) { } $gender = escape_tags($data['user']['profile']['gender']); - $about = diaspora2bb($data['user']['profile']['bio']); + $about = markdown_to_bb($data['user']['profile']['bio']); $publish = intval($data['user']['profile']['searchable']); if($data['user']['profile']['birthday']) $dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d'); |