diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 7d66664c..a1358539 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index fb6faee2..3ae70879 100644
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -69,9 +69,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':grenouille';
$b['icons'][] = ' . '/addon/smiley_pack/icons/animals/frog.gif' . ')
';
- $b['texts'][] = ':hamster';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/hamster.gif' . ')
';
-
$b['texts'][] = ':singe';
$b['icons'][] = ' . '/addon/smiley_pack/icons/animals/monkey.gif' . ')
';
@@ -81,9 +78,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':perroquet';
$b['icons'][] = ' . '/addon/smiley_pack/icons/animals/parrot.gif' . ')
';
- $b['texts'][] = ':tux';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/tux.gif' . ')
';
-
$b['texts'][] = ':escargot';
$b['icons'][] = ' . '/addon/smiley_pack/icons/animals/snail.gif' . ')
';
@@ -142,9 +136,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':afro';
$b['icons'][] = ' . '/addon/smiley_pack/icons/cool/affro.gif' . ')
';
- $b['texts'][] = ':cool';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/cool/cool.gif' . ')
';
-
#Devil/Angel Smileys
$b['texts'][] = ':ange';
@@ -168,9 +159,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':possédé';
$b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . ')
';
- $b['texts'][] = ':saint';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/saint.gif' . ')
';
-
$b['texts'][] = ':tombe';
$b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/graveside.gif' . ')
';
@@ -182,9 +170,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':pèteaulit';
$b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . ')
';
- $b['texts'][] = ':vomit';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/vomit.gif' . ')
';
-
$b['texts'][] = ':pet';
$b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/fartblush.gif' . ')
';
@@ -217,9 +202,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':basket';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/basketball.gif' . ')
';
- $b['texts'][] = ':bowling';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/bowling.gif' . ')
';
-
$b['texts'][] = ':vélo';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/cycling.gif' . ')
';
@@ -229,9 +211,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':escrime';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/fencing.gif' . ')
';
- $b['texts'][] = ':golf';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/golf.gif' . ')
';
-
$b['texts'][] = ':jonglage';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/juggling.gif' . ')
';
@@ -241,18 +220,12 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':arc';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/archery.gif' . ')
';
- $b['texts'][] = ':football';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/football.gif' . ')
';
-
$b['texts'][] = ':surf';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/surfing.gif' . ')
';
$b['texts'][] = ':billard';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/snooker.gif' . ')
';
- $b['texts'][] = ':tennis';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/tennis.gif' . ')
';
-
$b['texts'][] = ':équitation';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/horseriding.gif' . ')
';
@@ -264,9 +237,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':amoureux';
$b['icons'][] = ' . '/addon/smiley_pack/icons/love/inlove.gif' . ')
';
- $b['texts'][] = ':love';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/love.gif' . ')
';
-
$b['texts'][] = ':oursamour';
$b['icons'][] = ' . '/addon/smiley_pack/icons/love/lovebear.gif' . ')
';
@@ -298,9 +268,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':combatalien';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fight/alienfight.gif' . ')
';
- $b['texts'][] = ':alpha';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/alpha.png' . ')
';
-
$b['texts'][] = ':armée';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fight/army.gif' . ')
';
@@ -334,21 +301,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':mitrailleuse';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fight/machinegun.gif' . ')
';
- $b['texts'][] = ':marine';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/marine.gif' . ')
';
-
- $b['texts'][] = ':sabre';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/sabre.gif' . ')
';
-
- $b['texts'][] = ':tank';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/tank.gif' . ')
';
-
- $b['texts'][] = ':viking';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/viking.gif' . ')
';
-
- $b['texts'][] = ':gangs';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/gangs.gif' . ')
';
-
$b['texts'][] = ':acide';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fight/acid.gif' . ')
';
@@ -363,9 +315,6 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':dinosaure';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . ')
';
- $b['texts'][] = ':dragon';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dragon.gif' . ')
';
-
$b['texts'][] = ':petitdragon';
$b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . ')
';
@@ -428,26 +377,11 @@ function smiley_pack_fr_smilies(&$a,&$b) {
#Laugh smileys
- $b['texts'][] = ':hahaha';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/hahaha.gif' . ')
';
-
- $b['texts'][] = ':loltv';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/loltv.gif' . ')
';
-
- $b['texts'][] = ':rofl';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/rofl.gif' . ')
';
-
#Music smileys
- $b['texts'][] = ':dj';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/dj.gif' . ')
';
-
$b['texts'][] = ':batterie';
$b['icons'][] = ' . '/addon/smiley_pack/icons/music/drums.gif' . ')
';
- $b['texts'][] = ':elvis';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/elvis.gif' . ')
';
-
$b['texts'][] = ':guitare';
$b['icons'][] = ' . '/addon/smiley_pack/icons/music/guitar.gif' . ')
';
@@ -468,24 +402,7 @@ function smiley_pack_fr_smilies(&$a,&$b) {
$b['texts'][] = ':barbeblanche';
$b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . ')
';
- $b['texts'][] = ':shaka';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/shaka.gif' . ')
';
-
- $b['texts'][] = ':\\.../';
- $b['icons'][] = '';
-
- $b['texts'][] = ':\\ooo/';
- $b['icons'][] = '';
-
$b['texts'][] = ':tête';
$b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/headbang.gif' . ')
';
-#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
-
- $b['texts'][] = ':-d';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/laughing.gif' . ')
';
-
- $b['texts'][] = ':-o';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/surprised.gif' . ')
';
-
}
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 74d1da06..258ade76 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,7 +2,7 @@
/*
* Name: Smiley Pack
* Description: Pack of smileys that make master too AOLish.
- * Version: 1.02
+ * Version: 1.04
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
* All smileys from sites offering them as Public Domain
*/
@@ -141,9 +141,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':affro';
$b['icons'][] = '';
- $b['texts'][] = ':cool';
- $b['icons'][] = '';
-
#Devil/Angel Smileys
$b['texts'][] = ':angel';
@@ -181,9 +178,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':fartinbed';
$b['icons'][] = '';
- $b['texts'][] = ':vomit';
- $b['icons'][] = '';
-
$b['texts'][] = ':fartblush';
$b['icons'][] = '';
@@ -228,9 +222,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':fencing';
$b['icons'][] = '';
- $b['texts'][] = ':golf';
- $b['icons'][] = '';
-
$b['texts'][] = ':juggling';
$b['icons'][] = '';
@@ -240,18 +231,12 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':archery';
$b['icons'][] = '';
- $b['texts'][] = ':football';
- $b['icons'][] = '';
-
$b['texts'][] = ':surfing';
$b['icons'][] = '';
$b['texts'][] = ':snooker';
$b['icons'][] = '';
- $b['texts'][] = ':tennis';
- $b['icons'][] = '';
-
$b['texts'][] = ':horseriding';
$b['icons'][] = '';
@@ -297,9 +282,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':alienfight';
$b['icons'][] = '';
- $b['texts'][] = ':alpha';
- $b['icons'][] = '';
-
$b['texts'][] = ':army';
$b['icons'][] = '';
@@ -333,21 +315,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':machinegun';
$b['icons'][] = '';
- $b['texts'][] = ':marine';
- $b['icons'][] = '';
-
- $b['texts'][] = ':sabre';
- $b['icons'][] = '';
-
- $b['texts'][] = ':tank';
- $b['icons'][] = '';
-
- $b['texts'][] = ':viking';
- $b['icons'][] = '';
-
- $b['texts'][] = ':gangs';
- $b['icons'][] = '';
-
$b['texts'][] = ':acid';
$b['icons'][] = '';
@@ -438,14 +405,9 @@ function smiley_pack_smilies(&$a,&$b) {
#Music smileys
- $b['texts'][] = ':dj';
- $b['icons'][] = '';
-
$b['texts'][] = ':drums';
$b['icons'][] = '';
- $b['texts'][] = ':elvis';
- $b['icons'][] = '';
$b['texts'][] = ':guitar';
$b['icons'][] = '';
@@ -453,9 +415,6 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':trumpet';
$b['icons'][] = ' . '/addon/smiley_pack/icons/music/trumpet.gif' . ')
';
- $b['texts'][] = ':violin';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/violin.gif' . ')
';
-
#Smileys that used to be in core
$b['texts'][] = ':headbang';
@@ -487,7 +446,50 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':-o';
$b['icons'][] = '';
+# Regex killers - stick these at the bottom so they appear at the end of the English and
+# at the start of $OtherLanguage.
+
+ $b['texts'][] = ':cool';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':vomit';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':golf';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':football';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':tennis';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':alpha';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':marine';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':sabre';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':tank';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':viking';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':gangs';
+ $b['icons'][] = '';
+ $b['texts'][] = ':dj';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':elvis';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':violin';
+ $b['icons'][] = '';
}