May 9th, 2003

hacking, nerdy

Fixing talkread link in tools/memories.bml

I took a stab at fixing the links on tools/memories.bml.

Here's the patch:
<http://goathack.livejournal.org:8031/patches/2003-05-09-tools-memories.bml.diff >

I'm not submitting this patch. I'm pretty sure it's wrong, having compared it to similar patches I've seen. The call to LJ::item_link is missing $anum, but this is the only way it would work on my goathack.

What could be the problem? Is it the fact that I only have one cluster?
agent smith

Bad Lines in files from CVS

I have been having problems with a lot of the site working on my goathack account, and it seems like there are extra lines being inserted from CVS.

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.