beer smilie

diff --git a/boot.php b/boot.php
index 647290756b6611b28aa1fc4cdd745ad01716b39b..99108a0a3553713319db7a4d85364d23adec9ffc 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.1244' );
+define ( 'FRIENDICA_VERSION',      '2.3.1245' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1120      );
 

diff --git a/include/text.php b/include/text.php
index 70733bac5abb4721affb64692a6e4d343959ebf7..8206ba7e9226eff22ef00cd59644348a006c4257 100755 (executable)
--- a/include/text.php
+++ b/include/text.php
@@ -679,7 +679,7 @@ function smilies($s) {
 
        $s = str_replace(
        array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
-// ':beer', ':homebrew', 
+ ':beer', ':homebrew', 
                '~friendika', '~friendica', 'Diaspora*' ),
        array(
                '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -703,8 +703,8 @@ function smilies($s) {
                '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
                '<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />',
                '<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
-//             '<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/beer_mug.gif" alt=":beer" />',
+               '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
 
                '<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>',