aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-07 15:41:06 -0800
committerfriendica <info@friendica.com>2012-02-07 15:41:06 -0800
commit8a3c1f79300152d9b65b419ee33d129829043126 (patch)
tree2a61913947ba3d086d95e9710a20c5ecae5c38a4
parenta869bd2fe56d1795ab1d8744796a6e908e5adc29 (diff)
downloadvolse-hubzilla-8a3c1f79300152d9b65b419ee33d129829043126.tar.gz
volse-hubzilla-8a3c1f79300152d9b65b419ee33d129829043126.tar.bz2
volse-hubzilla-8a3c1f79300152d9b65b419ee33d129829043126.zip
beer smilie
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/text.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 647290756..99108a0a3 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.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 70733bac5..8206ba7e9 100755
--- a/include/text.php
+++ b/include/text.php
@@ -679,7 +679,7 @@ function smilies($s) {
$s = str_replace(
array( '&lt;3', '&lt;/3', '&lt;\\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>',