From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 23:38:44 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=415ca107fd61562dcec41fb336efdfde58d32c8b;p=friendica.git

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

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

* master:
---

415ca107fd61562dcec41fb336efdfde58d32c8b
diff --cc images/beard.jpg
index d65e0c33b6,d65e0c33b6..0000000000
deleted file mode 100644,100644
Binary files differ
diff --cc images/smiley-beard.png
index 0000000000,0000000000..14c81414f5
new file mode 100644
Binary files differ
diff --cc images/smiley-whitebeard.png
index 0000000000,0000000000..2a1fccbb72
new file mode 100644
Binary files differ
diff --cc images/whitebeard.jpg
index 363eba6a5f,363eba6a5f..0000000000
deleted file mode 100644,100644
Binary files differ
diff --cc include/text.php
index e7c95d35c9,e7c95d35c9..5ad0154d7a
--- a/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);