Merge branch 'master', remote-tracking branch 'remotes/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 aa79a7f01172204b4c6b788a50a84fd5a4818ac8..d85f9b5eddd268f97f4c942b738efb8e0aefd204 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -93,6 +93,20 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':dog';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';    
 
+       $b['texts'][] = ':elephant';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';  
+
+       $b['texts'][] = ':fish';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';  
+
+       $b['texts'][] = ':giraffe';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';    
+
+       $b['texts'][] = ':pig';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';    
+
+
+
 #Baby Smileys
 
        $b['texts'][] = ':baby';
@@ -119,6 +133,10 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':stupid';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';     
 
+       $b['texts'][] = ':dazed';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';       
+
+
 #Cool Smileys
 
        $b['texts'][] = ':affro';
@@ -167,6 +185,9 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':vomit';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
+       $b['texts'][] = ':fartblush';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+
 #Drinks
 
        $b['texts'][] = ':tea';
@@ -371,6 +392,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':cooking';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
+       $b['texts'][] = ':fryegg';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
 
 #Happy smileys