facepalm smiley

diff --git a/boot.php b/boot.php
index 9e74b8647708ee24c85606fb7601f94af87b00f9..34689b91ba90c03381f96bd6ec33801180545483 100755 (executable)
--- 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.1253' );
+define ( 'FRIENDICA_VERSION',      '2.3.1254' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1122      );
 

diff --git a/images/smiley-facepalm.gif b/images/smiley-facepalm.gif
new file mode 100644 (file)
index 0000000..7243703
Binary files /dev/null and b/images/smiley-facepalm.gif differ

diff --git a/include/text.php b/include/text.php
index 0d99e6f4ab715f8e8c923a85b5128b4d4fea2d32..8895f9813c09dadb24bf95478ba45deb593e727b 100755 (executable)
--- a/include/text.php
+++ b/include/text.php
@@ -715,6 +715,7 @@ function smilies($s, $sample = false) {
                ':beer', 
                ':homebrew', 
                ':coffee', 
+               ':facepalm',
                '~friendika', 
                '~friendica', 
                'Diaspora*' 
@@ -754,6 +755,7 @@ function smilies($s, $sample = false) {
                '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
                '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
                '<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
+               '<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
                '<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>',