diff --git a/images/beer_mug.gif b/images/emoticons/beer_mug.gif similarity index 100% rename from images/beer_mug.gif rename to images/emoticons/beer_mug.gif diff --git a/images/coffee.gif b/images/emoticons/coffee.gif similarity index 100% rename from images/coffee.gif rename to images/emoticons/coffee.gif diff --git a/images/dislike.gif b/images/emoticons/dislike.gif similarity index 100% rename from images/dislike.gif rename to images/emoticons/dislike.gif diff --git a/images/like.gif b/images/emoticons/like.gif similarity index 100% rename from images/like.gif rename to images/emoticons/like.gif diff --git a/images/smiley-Oo.gif b/images/emoticons/smiley-Oo.gif similarity index 100% rename from images/smiley-Oo.gif rename to images/emoticons/smiley-Oo.gif diff --git a/images/smiley-bangheaddesk.gif b/images/emoticons/smiley-bangheaddesk.gif similarity index 100% rename from images/smiley-bangheaddesk.gif rename to images/emoticons/smiley-bangheaddesk.gif diff --git a/images/smiley-beard.png b/images/emoticons/smiley-beard.png similarity index 100% rename from images/smiley-beard.png rename to images/emoticons/smiley-beard.png diff --git a/images/smiley-brokenheart.gif b/images/emoticons/smiley-brokenheart.gif similarity index 100% rename from images/smiley-brokenheart.gif rename to images/emoticons/smiley-brokenheart.gif diff --git a/images/smiley-cool.gif b/images/emoticons/smiley-cool.gif similarity index 100% rename from images/smiley-cool.gif rename to images/emoticons/smiley-cool.gif diff --git a/images/smiley-cry.gif b/images/emoticons/smiley-cry.gif similarity index 100% rename from images/smiley-cry.gif rename to images/emoticons/smiley-cry.gif diff --git a/images/smiley-embarassed.gif b/images/emoticons/smiley-embarassed.gif similarity index 100% rename from images/smiley-embarassed.gif rename to images/emoticons/smiley-embarassed.gif diff --git a/images/smiley-facepalm.gif b/images/emoticons/smiley-facepalm.gif similarity index 100% rename from images/smiley-facepalm.gif rename to images/emoticons/smiley-facepalm.gif diff --git a/images/smiley-foot-in-mouth.gif b/images/emoticons/smiley-foot-in-mouth.gif similarity index 100% rename from images/smiley-foot-in-mouth.gif rename to images/emoticons/smiley-foot-in-mouth.gif diff --git a/images/smiley-frown.gif b/images/emoticons/smiley-frown.gif similarity index 100% rename from images/smiley-frown.gif rename to images/emoticons/smiley-frown.gif diff --git a/images/smiley-heart.gif b/images/emoticons/smiley-heart.gif similarity index 100% rename from images/smiley-heart.gif rename to images/emoticons/smiley-heart.gif diff --git a/images/smiley-innocent.gif b/images/emoticons/smiley-innocent.gif similarity index 100% rename from images/smiley-innocent.gif rename to images/emoticons/smiley-innocent.gif diff --git a/images/smiley-kiss.gif b/images/emoticons/smiley-kiss.gif similarity index 100% rename from images/smiley-kiss.gif rename to images/emoticons/smiley-kiss.gif diff --git a/images/smiley-laughing.gif b/images/emoticons/smiley-laughing.gif similarity index 100% rename from images/smiley-laughing.gif rename to images/emoticons/smiley-laughing.gif diff --git a/images/smiley-money-mouth.gif b/images/emoticons/smiley-money-mouth.gif similarity index 100% rename from images/smiley-money-mouth.gif rename to images/emoticons/smiley-money-mouth.gif diff --git a/images/smiley-sealed.gif b/images/emoticons/smiley-sealed.gif similarity index 100% rename from images/smiley-sealed.gif rename to images/emoticons/smiley-sealed.gif diff --git a/images/smiley-shaka.gif b/images/emoticons/smiley-shaka.gif similarity index 100% rename from images/smiley-shaka.gif rename to images/emoticons/smiley-shaka.gif diff --git a/images/smiley-smile.gif b/images/emoticons/smiley-smile.gif similarity index 100% rename from images/smiley-smile.gif rename to images/emoticons/smiley-smile.gif diff --git a/images/smiley-surprised.gif b/images/emoticons/smiley-surprised.gif similarity index 100% rename from images/smiley-surprised.gif rename to images/emoticons/smiley-surprised.gif diff --git a/images/smiley-thumbsup.gif b/images/emoticons/smiley-thumbsup.gif similarity index 100% rename from images/smiley-thumbsup.gif rename to images/emoticons/smiley-thumbsup.gif diff --git a/images/smiley-tongue-out.gif b/images/emoticons/smiley-tongue-out.gif similarity index 100% rename from images/smiley-tongue-out.gif rename to images/emoticons/smiley-tongue-out.gif diff --git a/images/smiley-undecided.gif b/images/emoticons/smiley-undecided.gif similarity index 100% rename from images/smiley-undecided.gif rename to images/emoticons/smiley-undecided.gif diff --git a/images/smiley-whitebeard.png b/images/emoticons/smiley-whitebeard.png similarity index 100% rename from images/smiley-whitebeard.png rename to images/emoticons/smiley-whitebeard.png diff --git a/images/smiley-wink.gif b/images/emoticons/smiley-wink.gif similarity index 100% rename from images/smiley-wink.gif rename to images/emoticons/smiley-wink.gif diff --git a/images/smiley-yell.gif b/images/emoticons/smiley-yell.gif similarity index 100% rename from images/smiley-yell.gif rename to images/emoticons/smiley-yell.gif diff --git a/include/text.php b/include/text.php index 03044c78f..dbb0f4434 100644 --- a/include/text.php +++ b/include/text.php @@ -1171,38 +1171,38 @@ function list_smilies() { ); $icons = array( - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', ); @@ -1296,7 +1296,7 @@ function preg_heart($x) { $t = ''; for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) - $t .= ''; + $t .= ''; $r = str_replace($x[0],$t,$x[0]); diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl index 2b80b9e80..7d503cc53 100644 --- a/view/tpl/achievements.tpl +++ b/view/tpl/achievements.tpl @@ -1,9 +1,9 @@
{{$newmembertext}}
-{{if $profilebadge}}{{/if}} -{{if $contactbadge}}{{/if}} -{{if $keywordsbadge}}{{/if}} -{{if $channelsbadge}}{{/if}} +{{if $profilebadge}}{{/if}} +{{if $contactbadge}}{{/if}} +{{if $keywordsbadge}}{{/if}} +{{if $channelsbadge}}{{/if}}