Merge pull request #94 from beardy-unixer/master

Documentation changes

1 files changed, 5 insertions, 1 deletions

diff --git a/include/text.php b/include/text.php
index c8c03174e..e7c95d35c 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -738,6 +738,9 @@ function smilies($s, $sample = false) {
 		'~friendika', 
 		'~friendica', 
 //		'Diaspora*' 
+		':beard',
+		':whitebeard'
+
 	);
 
 	$icons = array(
@@ -779,7 +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" />'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);