For instance, in cvs/livejournal/htdocs/update.bml I found these lines:
<<<<<<< update.bml
$res{'message'} = LJ::eall($res{'message'});
<<<<<<< update.bml
$res{'message'} =~ s!("|')?(http://[a-z0-9A-Z_\-\.\/\?\%\+\=\&\:\;]+)!$1 ? "$1$2" : "$2"!eg;
=======
$res{'message'} =~ s!("|')?(https?://\S+[a-zA-Z0-9_/&=\-])!$1 ? $& : "$2"!eg;
>>>>>>> 1.38
$message = "$ML{'.servermsg'}
- $res{'message'}
=======
I found another one in talkpost.bml. Not sure if I'm doing something wrong, problem with cvsreport.pl, or what the deal is but any help is appreciated.
