Merge pull request #100 from simonlnu/master

fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png

1 files changed, 2 insertions, 2 deletions

diff --git a/include/text.php b/include/text.php
index e7c95d35c..5ad0154d7 100644
--- a/include/text.php
+++ b/include/text.php
@@ -782,8 +782,8 @@ function smilies($s, $sample = false) {
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
 //		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
-		'<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
-		'<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
+		'<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);