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

This commit is contained in:
Tobias Hößl 2012-04-22 11:59:04 +00:00
commit 32d85bfaf2
4 changed files with 3 additions and 0 deletions
facebook.tgz
smiley_pack

Binary file not shown.

Binary file not shown.

Before

(image error) Size: 2.3 KiB

After

(image error) Size: 864 B

Binary file not shown.

After

(image error) Size: 5.5 KiB

View file

@ -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';