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

sort out some of the bb2d madness

Browse Source
This commit is contained in:
friendica
2014-09-03 22:00:18 -07:00
parent 96a9378fd7
commit 6ad9d9f845
2 changed files with 27 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/bb2diaspora.php
View File

@@ -252,6 +252,7 @@ function bb2diaspora_itembody($item) {
if($item['diaspora_meta']) {
$j = json_decode($item['diaspora_meta'],true);
if($j && $j['body']) {
logger('bb2diaspora_itembody: cached ');
return $j['body'];
}
}
@@ -299,6 +300,8 @@ function bb2diaspora_itembody($item) {
}
}
logger('bb2diaspora_itembody : ' . $body);
return html_entity_decode($body);
}
@@ -316,10 +319,7 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
'return \'#\'. str_replace(\' \', \'_\', $match[3]);'
), $Text);
$Text = preg_replace_callback('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', create_function('$match',
'return str_replace(\' \', \'_\', $match[3]);'
), $Text);
$Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
$Text = preg_replace_callback('/\@\!?\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', 'bb2dmention_callback', $Text);