diff options
| -rw-r--r-- | Zotlabs/Module/Item.php | 2 | ||||
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | include/Import/import_diaspora.php | 2 | ||||
| -rw-r--r-- | include/bb2diaspora.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 11fa9d8bf..96f656f7b 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -508,7 +508,7 @@ class Item extends \Zotlabs\Web\Controller { // $body = escape_tags(trim($body)); // $body = str_replace("\n",'<br />', $body); // $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_shield',$body); - // $body = diaspora2bb($body,true); + // $body = markdown_to_bb($body,true); // $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_unshield',$body); // } @@ -44,7 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.15' ); +define ( 'STD_VERSION', '1.15.1' ); define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1184 ); 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); |