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

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

* master:

diff --cc images/beard.jpg
index d65e0c33b685335a8ba07a8cf73fa0dafd3590ce,d65e0c33b685335a8ba07a8cf73fa0dafd3590ce..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc images/smiley-beard.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..14c81414f5047c1f86780d021cf242d9a0470d84
new file mode 100644 (file)
Binary files differ

diff --cc images/smiley-whitebeard.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2a1fccbb725dbcd6668380a3f591bdae7467bd28
new file mode 100644 (file)
Binary files differ

diff --cc images/whitebeard.jpg
index 363eba6a5f9a1a3847c15561edef660e2c980ea7,363eba6a5f9a1a3847c15561edef660e2c980ea7..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc include/text.php
index e7c95d35c995341386298fcd8044a2b6ed30d285,e7c95d35c995341386298fcd8044a2b6ed30d285..5ad0154d7a3e3fc3aeb257cab83d53231d818144
--- 1/include/text.php
--- 2/include/text.php
+++ b/include/text.php
@@@ -782,8 -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);