Merge branch 'master' of git://github.com/friendica/friendica-addons

diff --git a/facebook.tgz b/facebook.tgz
index e3709ec48955c9965509593e6f21238148693d4e..681be28a89cf5845cb2dcc9e30118a122ebe5a13 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ

diff --git a/smiley_pack/icons/animals/cat.gif b/smiley_pack/icons/animals/cat.gif
index 3a0db669460de5e8000b51bada20b71f21a6261d..a612c476589022d971813cdd9829936e147ad9b5 100644 (file)
Binary files a/smiley_pack/icons/animals/cat.gif and b/smiley_pack/icons/animals/cat.gif differ

diff --git a/smiley_pack/icons/tired/yawn.gif b/smiley_pack/icons/tired/yawn.gif
new file mode 100644 (file)
index 0000000..975cb26
Binary files /dev/null and b/smiley_pack/icons/tired/yawn.gif differ

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 7f4bfb7b643de06caa53754b10e46cd55efcd4ca..533ebbb108eb37cb4cfe238ec11f7bc89878174f 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -284,6 +284,9 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':pillow';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
+       $b['texts'][] = ':yawn';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
+
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2guns';