projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57d631b
)
smilie hook
author
Friendika
<info@friendika.com>
Mon, 12 Sep 2011 10:21:39 +0000
(
03:21
-0700)
committer
Friendika
<info@friendika.com>
Mon, 12 Sep 2011 10:21:39 +0000
(
03:21
-0700)
include/text.php
patch
|
blob
|
history
diff --git
a/include/text.php
b/include/text.php
index 33add768f88980404d93989f7d0dc469a4676c83..2d65b681db4ed35c917e5978745a594f4836dc8a 100644
(file)
--- 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;
+
}}