aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Import/import_diaspora.php2
-rw-r--r--include/bb2diaspora.php2
2 files changed, 2 insertions, 2 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');
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 9bc6eaf9f..14d5b4eef 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -123,7 +123,7 @@ function diaspora_mention_callback($matches) {
* @param boolean $use_zrl default false
* @return string
*/
-function diaspora2bb($s, $use_zrl = false) {
+function markdown_to_bb($s, $use_zrl = false) {
$s = str_replace("
","\r",$s);
$s = str_replace("
\n>","",$s);