diff --git a/images/beard.jpg b/images/beard.jpg deleted file mode 100644 index d65e0c33b6..0000000000 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 index 0000000000..14c81414f5 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 index 0000000000..2a1fccbb72 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 index 363eba6a5f..0000000000 Binary files a/images/whitebeard.jpg and /dev/null differ diff --git a/include/text.php b/include/text.php index e7c95d35c9..5ad0154d7a 100644 --- a/include/text.php +++ b/include/text.php @@ -782,8 +782,8 @@ function smilies($s, $sample = false) { '~friendika ~friendika', '~friendica ~friendica', // 'DiasporaDiaspora*', - ':beard', - ':whitebeard' + ':beard', + ':whitebeard' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);