[dw-free] Fix regex for user-tag insertion

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/d019d0f88a75]

Fix regex for user-tag insertion

This regex was broken, it would allow you to do something like "@xb95...."
and try to treat that as a user tag. Now, the regex requires you to do
something that looks like a domain.

This also fixes the case where you refer to someone at the end of a sentence
and it would eat the period.

Patch by mark.

Files modified:

• cgi-bin/LJ/CleanHTML.pm

--------------------------------------------------------------------------------
diff -r eaca18a897b2 -r d019d0f88a75 cgi-bin/LJ/CleanHTML.pm
--- a/cgi-bin/LJ/CleanHTML.pm	Mon Jun 18 20:49:55 2012 +0800
+++ b/cgi-bin/LJ/CleanHTML.pm	Tue Jun 19 04:11:26 2012 +0000
@@ -1495,7 +1495,7 @@
                 return qq|\@$user.$site|;
             }
         };
-        $$ref =~ s/(?<=\W)\@([\w\d_]+)(?:\.([\w\d\.]+))?(?=$|\W)/$usertag->($1, $2)/mge;
+        $$ref =~ s/(?<=\W)\@([\w\d_]+)((?:\.[\w\d]+)+)?(?=$|\W)/$usertag->($1, $2)/mge;
     }
 
     my $wordlength = defined $opts->{'wordlength'} ? $opts->{'wordlength'} : 40;
--------------------------------------------------------------------------------