Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: fix html reshares when editplain in use * master:
This commit is contained in:
commit
415ca107fd
BIN
images/beard.jpg
BIN
images/beard.jpg
Binary file not shown.
Before Width: | Height: | Size: 989 B |
BIN
images/smiley-beard.png
Normal file
BIN
images/smiley-beard.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1,021 B |
BIN
images/smiley-whitebeard.png
Normal file
BIN
images/smiley-whitebeard.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1 KiB |
Binary file not shown.
Before Width: | Height: | Size: 951 B |
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue