[SimBot-commits] CVS: simbot/plugins sqlite-logger.pl,1.50,1.51

[Pete P. <fou...@us...>]

Update of /cvsroot/simbot/simbot/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054/plugins

Modified Files:
	sqlite-logger.pl 
Log Message:
Links in the HTML no longer get cut off at the ; in &


Index: sqlite-logger.pl
===================================================================
RCS file: /cvsroot/simbot/simbot/plugins/sqlite-logger.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -p -r1.50 -r1.51
--- sqlite-logger.pl	10 Aug 2005 11:50:59 -0000	1.50
+++ sqlite-logger.pl	10 Aug 2005 18:37:30 -0000	1.51
@@ -746,7 +746,8 @@ sub row_hashref_to_template_hashref {
 # this does things like linkify URLs, escape characters that
 # need escaping, munge email addresses, and things like that.
 sub f_content {
-    my $content = encode_entities($_[0]);
+    my $content = $_[0];
+    $content = encode_entities($content);
     
     # linkify
     $content = &linkify($content);
@@ -964,7 +965,7 @@ sub linkify {
             next;
         }
         
-        if($url =~ m{^((http|ftp|news|nntp|irc|aim)s?:[\w.?/=\-\&]+)}) {
+        if($url =~ m{^((http|ftp|news|nntp|irc|aim)s?:[\w.?/=\-\&\;]+)}) {
             $curWord = qq(<a href="$1">$curWord</a>);
             next;
         }