diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | images/smiley-facepalm.gif | bin | 0 -> 582 bytes | |||
| -rwxr-xr-x | include/text.php | 2 |
3 files changed, 3 insertions, 1 deletions
@@ -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 Binary files differnew file mode 100644 index 000000000..724370369 --- /dev/null +++ b/images/smiley-facepalm.gif diff --git a/include/text.php b/include/text.php index 0d99e6f4a..8895f9813 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>', |
