From 6ad9d9f8454b1a44800a406d9eeaaa45ed10e8da Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 22:00:18 -0700 Subject: sort out some of the bb2d madness --- include/bb2diaspora.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/bb2diaspora.php') diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 622f239ad..9c8c05aeb 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -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); -- cgit v1.2.3