aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-11 16:58:36 -0800
committerfriendica <info@friendica.com>2011-12-11 16:58:36 -0800
commit834639ebab3daded63c3ed076273e69b798ced90 (patch)
treeb5fb3b69ae5a587cc1ab13e76d147fdd9bf8cb59
parentacdc7ca05af929aba99e5e54015e454c287c0980 (diff)
downloadvolse-hubzilla-834639ebab3daded63c3ed076273e69b798ced90.tar.gz
volse-hubzilla-834639ebab3daded63c3ed076273e69b798ced90.tar.bz2
volse-hubzilla-834639ebab3daded63c3ed076273e69b798ced90.zip
\o/ smiley
-rw-r--r--boot.php2
-rw-r--r--images/smiley-thumbsup.gifbin0 -> 1350 bytes
-rw-r--r--include/text.php3
3 files changed, 3 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index c44760930..8452108ff 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1190' );
+define ( 'FRIENDICA_VERSION', '2.3.1192' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1111 );
diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif
new file mode 100644
index 000000000..a9533a64d
--- /dev/null
+++ b/images/smiley-thumbsup.gif
Binary files differ
diff --git a/include/text.php b/include/text.php
index 29e53c663..04d5dfced 100644
--- a/include/text.php
+++ b/include/text.php
@@ -674,7 +674,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',
+ array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
'~friendika', '~friendica', 'Diaspora*' ),
array(
'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -693,6 +693,7 @@ function smilies($s) {
'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
'<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/" />',
'<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>',