harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generic use

Browse Source
This commit is contained in:
zotlabs 2016-10-16 16:48:33 -07:00
parent 5ea46444e9
commit e46e3027fa
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Item.php
View File

@ -508,7 +508,7 @@ class Item extends \Zotlabs\Web\Controller {
// $body = escape_tags(trim($body)); // $body = escape_tags(trim($body));
// $body = str_replace("\n",'<br />', $body); // $body = str_replace("\n",'<br />', $body);
// $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_shield',$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); // $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_unshield',$body);
// } // }

2
boot.php
View File

@ -44,7 +44,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.15' ); define ( 'STD_VERSION', '1.15.1' );
define ( 'ZOT_REVISION', '1.1' ); define ( 'ZOT_REVISION', '1.1' );
define ( 'DB_UPDATE_VERSION', 1184 ); define ( 'DB_UPDATE_VERSION', 1184 );

2
include/Import/import_diaspora.php
View File

@ -89,7 +89,7 @@ function import_diaspora($data) {
} }
$gender = escape_tags($data['user']['profile']['gender']); $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']); $publish = intval($data['user']['profile']['searchable']);
if($data['user']['profile']['birthday']) if($data['user']['profile']['birthday'])
$dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d'); $dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d');

2
include/bb2diaspora.php
View File

@ -123,7 +123,7 @@ function diaspora_mention_callback($matches) {
* @param boolean $use_zrl default false * @param boolean $use_zrl default false
* @return string * @return string
*/ */
function diaspora2bb($s, $use_zrl = false) { function markdown_to_bb($s, $use_zrl = false) {
$s = str_replace("&#xD;","\r",$s); $s = str_replace("&#xD;","\r",$s);
$s = str_replace("&#xD;\n&gt;","",$s); $s = str_replace("&#xD;\n&gt;","",$s);