From 7dcef67492f713afcf4e3a9e5949f01416a6bcff Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 16 Feb 2012 15:15:28 -0800
Subject: [PATCH] facepalm smiley

---
 boot.php                   |   2 +-
 images/smiley-facepalm.gif | Bin 0 -> 582 bytes
 include/text.php           |   2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 images/smiley-facepalm.gif

diff --git a/boot.php b/boot.php
index 9e74b86477..34689b91ba 100755
--- 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
index 0000000000000000000000000000000000000000..7243703698f3b93a9315bce9198d4b514e2c4ab7
GIT binary patch
literal 582
zcmc)H%S#gg0D$o?w$jFIwpM$!m&-NxXt_acNy|3(s@B%5tqw_vpvQSK@UXS$((tfJ
zdeB4aO$Zr^7ZFBCV4@-hdhnol@gSliY6ms@EBf*M2VW=>bbH=cQ_auUNF+$5$YjXn
zs8p!cXf$ZG=yd4y7!1_ZU^G%&i^+u9jKzZ0ip_@Ij>Cb|iOYq@gV&4Chu=>iKqy2w
zOe8`yN-Rb^P9i}vNlOc@t+ch#-cCmc=`@|4bam0)O*TtU55*$Az4Z0b-_Otxqoa(C
zQ7SP$&cp<hlT1x9Jx#gH%nY-$%*`=B&%y$Wi!3d%yv)i9tE;T7vA)j62Ai8~ZLz)0
z&JMe~?Cr6?&%ptQha4Soe9XxSr>C5qo%eqj{s=FK$YA5#zb90TWHY&(SR|E*E`Q2r
zE?R@HQmKU3{3S1R6bA;vH}dwu;neeMIZ>_L`f{ZB@Df*4k$ak_-&0kB>y7FM0i|y+
zZgE}}-!{I`xug0!g=b3lErHloZ%!EQC+oG3RQ|XuBfZ&l*VO!^7&1Oi)rm5d0Y$u_
sFx;%D$XP%9E`JsL&<kVfw{HyZ3YDMh6v}TO^8teDrmA11#<-q_zxb&G)Bpeg

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index 0d99e6f4ab..8895f9813c 100755
--- 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>',