Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-11-15 21:53:31 +01:00
commit a06bd90965
2 changed files with 3 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

View file

@ -370,6 +370,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':fryegg'; $b['texts'][] = ':fryegg';
$b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />'; $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
$b['texts'][] = ':birthdaycake';
$b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
#Happy smileys #Happy smileys
$b['texts'][] = ':cloud9'; $b['texts'][] = ':cloud9';