;) :D and :-O are also enabled for wink laugh and surprised smiley's
This commit is contained in:
		| @@ -678,7 +678,7 @@ function smilies($s) { | |||||||
| 	$a = get_app(); | 	$a = get_app(); | ||||||
|  |  | ||||||
| 	$s = str_replace( | 	$s = str_replace( | ||||||
| 	array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/',  |                          array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', | ||||||
|  ':beer', ':homebrew', ':coffee',  |  ':beer', ':homebrew', ':coffee',  | ||||||
|                '~friendika', '~friendica', 'Diaspora*' ), |                '~friendika', '~friendica', 'Diaspora*' ), | ||||||
| 	array( | 	array( | ||||||
| @@ -688,6 +688,7 @@ function smilies($s) { | |||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', | ||||||
|  |                 '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";)"/>',                 | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />', | ||||||
| @@ -697,13 +698,16 @@ function smilies($s) { | |||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />', | ||||||
|  |                 '<img src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":D"/>',                 | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />', | ||||||
|  | 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',                 | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />', | 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',                 | 		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',                 | ||||||
|  |                  | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />', | 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />', | 		'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />', | ||||||
| 		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />', | 		'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />', | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user