diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /mod/share.php | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'mod/share.php')
| -rw-r--r--[-rwxr-xr-x] | mod/share.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mod/share.php b/mod/share.php index 47bb851a4..6c6098c83 100755..100644 --- a/mod/share.php +++ b/mod/share.php @@ -16,18 +16,18 @@ function share_init(&$a) { $o = ''; - if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) { +// if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) { $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; 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 />'; - } +// } +// 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 .= $r[0]['body'] . "\n"; +// } echo $o; killme(); } |