Browse Source

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
pull/100/head
Simon L'nu 10 years ago
parent
commit
415ca107fd
  1. BIN
      images/beard.jpg
  2. BIN
      images/smiley-beard.png
  3. BIN
      images/smiley-whitebeard.png
  4. BIN
      images/whitebeard.jpg
  5. 4
      include/text.php
  6. 18
      mod/share.php

BIN
images/beard.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 989 B

BIN
images/smiley-beard.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1021 B

BIN
images/smiley-whitebeard.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
images/whitebeard.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 951 B

4
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);

18
mod/share.php

@ -16,10 +16,18 @@ function share_init(&$a) {
$o = '';
$o .= '&#x2672; <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 .= '&#x2672; [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 .= '&#x2672; <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…
Cancel
Save