diff --git a/images/beard.jpg b/images/beard.jpg
deleted file mode 100644
index d65e0c33..00000000
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 00000000..14c81414
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 00000000..2a1fccbb
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 363eba6a..00000000
Binary files a/images/whitebeard.jpg and /dev/null differ
diff --git a/include/text.php b/include/text.php
index e7c95d35..5ad0154d 100644
--- a/include/text.php
+++ b/include/text.php
@@ -782,8 +782,8 @@ function smilies($s, $sample = false) {
'~friendika
',
'~friendica
',
// 'Diaspora
',
- '
',
- '
'
+ '
',
+ '
'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
diff --git a/mod/share.php b/mod/share.php
index bba52734..f6c025e3 100755
--- a/mod/share.php
+++ b/mod/share.php
@@ -16,10 +16,18 @@ function share_init(&$a) {
$o = '';
- $o .= '♲ ' . $r[0]['author-name'] . '
';
- if($r[0]['title'])
- $o .= '' . $r[0]['title'] . '
';
- $o .= bbcode($r[0]['body'], true);
- echo $o . '
';
+ if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
+ $o .= '♲ [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
+ if($r[0]['title'])
+ $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
+ $o .= $r[0]['body'] . "\n";
+ }
+ else {
+ $o .= '♲ ' . $r[0]['author-name'] . '
';
+ if($r[0]['title'])
+ $o .= '' . $r[0]['title'] . '
';
+ $o .= bbcode($r[0]['body'], true) . '
';
+ }
+ echo $o;
killme();
}