aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-05 19:56:38 -0700
committerfriendica <info@friendica.com>2012-07-05 19:56:38 -0700
commit868e04f5eb8510670816aa51f25073150d3747e7 (patch)
treee9d6cea17c2f536003ee2afb96ff811431519635
parenta71365d5665fd3ed51ea9bd44b9a4571e6d3ad69 (diff)
parent47c7fd89ba76732c779cc79648a2c7ab2e914041 (diff)
downloadvolse-hubzilla-868e04f5eb8510670816aa51f25073150d3747e7.tar.gz
volse-hubzilla-868e04f5eb8510670816aa51f25073150d3747e7.tar.bz2
volse-hubzilla-868e04f5eb8510670816aa51f25073150d3747e7.zip
Merge pull request #378 from fermionic/apparent-typo-in-function-name
my php thinks this is a typo
-rw-r--r--include/bb2diaspora.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 75dadb84c..042177fd9 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -45,7 +45,7 @@ function diaspora2bb($s) {
// $s = str_replace('&#42;','*',$s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
- $s = str_replace('&#x2672;',html_entities_decode('&#x2672;',ENT_QUOTES,'UTF-8'),$s);
+ $s = str_replace('&#x2672;',html_entity_decode('&#x2672;',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);