aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/text.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 33add768f..2d65b681d 100644
--- a/include/text.php
+++ b/include/text.php
@@ -656,7 +656,7 @@ if(! function_exists('smilies')) {
function smilies($s) {
$a = get_app();
- return str_replace(
+ $s = str_replace(
array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O',
'~friendika', 'Diaspora*' ),
array(
@@ -680,6 +680,10 @@ function smilies($s) {
'<a href="http://joindiaspora.com">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
), $s);
+
+ call_hooks('smilie', $s);
+ return $s;
+
}}