aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/beard.jpgbin989 -> 0 bytes
-rw-r--r--images/smiley-beard.pngbin0 -> 1021 bytes
-rw-r--r--images/smiley-whitebeard.pngbin0 -> 1060 bytes
-rw-r--r--images/whitebeard.jpgbin951 -> 0 bytes
-rw-r--r--include/text.php4
5 files changed, 2 insertions, 2 deletions
diff --git a/images/beard.jpg b/images/beard.jpg
deleted file mode 100644
index d65e0c33b..000000000
--- a/images/beard.jpg
+++ /dev/null
Binary files differ
diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 000000000..14c81414f
--- /dev/null
+++ b/images/smiley-beard.png
Binary files differ
diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
new file mode 100644
index 000000000..2a1fccbb7
--- /dev/null
+++ b/images/smiley-whitebeard.png
Binary files differ
diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
deleted file mode 100644
index 363eba6a5..000000000
--- a/images/whitebeard.jpg
+++ /dev/null
Binary files differ
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);