Merge remote-tracking branch 'upstream/master'

[friendica-addons.git] / smiley_pack / smiley_pack.php~

diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
index d333b34c08c83b095d923861aa2a8374bde08537..09fcc6ffc39699e3eeafdc729a64965da601be70 100644 (file)
--- a/smiley_pack/smiley_pack.php~
+++ b/smiley_pack/smiley_pack.php~
@@ -280,4 +280,26 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':mummy';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
+       $b['texts'][] = ':apple';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
+
+       $b['texts'][] = ':broccoli';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
+
+       $b['texts'][] = ':cake';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
+
+       $b['texts'][] = ':carrot';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
+
+       $b['texts'][] = ':popcorn';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+
+       $b['texts'][] = ':tomato';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
+
+
+
+
+
 }