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

diff --git a/images/beard.jpg b/images/beard.jpg
deleted file mode 100644 (file)
index d65e0c3..0000000
Binary files a/images/beard.jpg and /dev/null differ

diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644 (file)
index 0000000..14c8141
Binary files /dev/null and b/images/smiley-beard.png differ

diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
new file mode 100644 (file)
index 0000000..2a1fccb
Binary files /dev/null and b/images/smiley-whitebeard.png differ

diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
deleted file mode 100644 (file)
index 363eba6..0000000
Binary files a/images/whitebeard.jpg and /dev/null differ

diff --git a/include/text.php b/include/text.php
index e7c95d35c995341386298fcd8044a2b6ed30d285..5ad0154d7a3e3fc3aeb257cab83d53231d818144 100644 (file)
--- 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);