[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.20,1.21

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10762

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
Don't screw up badly when smilies appear mid-sentence:
"hello:Dolly" would be transfered to the :-D smilie.
Adjusted regular expressions so that a whitespace character before and after the smilie is needed.
Does this create new trouble?


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_event_emoticate.php	9 Feb 2005 16:26:07 -0000	1.20
+++ serendipity_event_emoticate.php	16 Feb 2005 10:16:09 -0000	1.21
@@ -171,7 +171,7 @@
                             $element = &$eventData[$temp['element']];
 
                             foreach ($this->getEmoticons() as $key => $value) {
-                                $element = preg_replace("/([\t\ ]?)" . $key . "([\t\ \!\.\)]?)/m",
+                                $element = preg_replace("/([\t\s\.]+)" . $key . "([\t\s\!\.\)]+)/m",
                                     "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" class=\"emoticon\" />$2",
                                     $element);
                             }