clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #378 from fermionic/apparent-typo-in-function-name 

my php thinks this is a typo
This commit is contained in:
friendica 2012-07-05 19:56:38 -07:00
parent a71365d566 47c7fd89ba
commit 868e04f5eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/bb2diaspora.php
View File

@ -45,7 +45,7 @@ function diaspora2bb($s) {
// $s = str_replace('*','*',$s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
$s = str_replace('♲',html_entities_decode('♲',ENT_QUOTES,'UTF-8'),$s);
$s = str_replace('♲',html_entity_decode('♲',ENT_QUOTES,'UTF-8'),$s);
// Convert everything that looks like a link to a link
$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);