aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-04 00:04:19 -0800
committerfriendica <info@friendica.com>2012-01-04 00:04:19 -0800
commit48a5a2484e762a9804237ae28c24dafe5db7f953 (patch)
tree859bbc4580b9e940c2918a046683e9b22d460e10 /include/text.php
parentfc7d0360bb059bf87c5c531a2bfd5bcee3aef3f6 (diff)
downloadvolse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.tar.gz
volse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.tar.bz2
volse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.zip
new smiley
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index f32aaad07..1db88ca2c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
$a = get_app();
$s = str_replace(
- array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
+ array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o',
'~friendika', '~friendica', 'Diaspora*' ),
array(
'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -698,6 +698,8 @@ function smilies($s) {
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+ '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
+ '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',