Merge https://github.com/friendica/friendica-addons into apull

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 8aae089db8c8c1a74b68682c1d8fbed27125b658..790bc064f5f93159b04341834142d5b1d9385850 100644 (file)
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 533ebbb108eb37cb4cfe238ec11f7bc89878174f..ed4d0e651405e8d56d57f8794779c61f7b8628dd 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -214,8 +214,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':basketball';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
-       $b['texts'][] = ':bowling';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bowling' . '" />';
+       $b['texts'][] = '~bowling';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
 
        $b['texts'][] = ':cycling';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';