diff options
| -rw-r--r-- | images/beard.jpg | bin | 989 -> 0 bytes | |||
| -rw-r--r-- | images/smiley-beard.png | bin | 0 -> 1021 bytes | |||
| -rw-r--r-- | images/smiley-whitebeard.png | bin | 0 -> 1060 bytes | |||
| -rw-r--r-- | images/whitebeard.jpg | bin | 951 -> 0 bytes | |||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rwxr-xr-x | mod/share.php | 18 |
6 files changed, 15 insertions, 7 deletions
diff --git a/images/beard.jpg b/images/beard.jpg Binary files differdeleted file mode 100644 index d65e0c33b..000000000 --- a/images/beard.jpg +++ /dev/null diff --git a/images/smiley-beard.png b/images/smiley-beard.png Binary files differnew file mode 100644 index 000000000..14c81414f --- /dev/null +++ b/images/smiley-beard.png diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png Binary files differnew file mode 100644 index 000000000..2a1fccbb7 --- /dev/null +++ b/images/smiley-whitebeard.png diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg Binary files differdeleted file mode 100644 index 363eba6a5..000000000 --- a/images/whitebeard.jpg +++ /dev/null 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); diff --git a/mod/share.php b/mod/share.php index bba527342..f6c025e3c 100755 --- a/mod/share.php +++ b/mod/share.php @@ -16,10 +16,18 @@ function share_init(&$a) { $o = ''; - $o .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; - if($r[0]['title']) - $o .= '<strong>' . $r[0]['title'] . '</strong><br />'; - $o .= bbcode($r[0]['body'], true); - echo $o . '<br />'; + 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 .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; + if($r[0]['title']) + $o .= '<strong>' . $r[0]['title'] . '</strong><br />'; + $o .= bbcode($r[0]['body'], true) . '<br />'; + } + echo $o; killme(); } |
