[dw-free] clean up log messages that appear when global warnings are on
[commit: http://hg.dwscoalition.org/dw-free/rev/b5e7f2ef00f2]
http://bugs.dwscoalition.org/show_bug.cgi?id=3040
Switch to using the (new) DW::Request object rather than BML::request. Make
sure to always have a return value for the cleanup handler, to avoid
warnings.
Patch by
kareila.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=3040
Switch to using the (new) DW::Request object rather than BML::request. Make
sure to always have a return value for the cleanup handler, to avoid
warnings.
Patch by
Files modified:
- cgi-bin/LJ/UniqCookie.pm
- cgi-bin/ljlib.pl
--------------------------------------------------------------------------------
diff -r 4240985f1329 -r b5e7f2ef00f2 cgi-bin/LJ/UniqCookie.pm
--- a/cgi-bin/LJ/UniqCookie.pm Fri Oct 08 16:09:08 2010 +0800
+++ b/cgi-bin/LJ/UniqCookie.pm Fri Oct 08 16:13:36 2010 +0800
@@ -494,8 +494,8 @@ sub set_current_uniq {
return unless LJ::is_web_context();
- my $r = BML::get_request();
- $r->notes->{uniq} = $uniq if $r;
+ my $r = DW::Request->get;
+ $r->note( uniq => $uniq );
return;
}
diff -r 4240985f1329 -r b5e7f2ef00f2 cgi-bin/ljlib.pl
--- a/cgi-bin/ljlib.pl Fri Oct 08 16:09:08 2010 +0800
+++ b/cgi-bin/ljlib.pl Fri Oct 08 16:13:36 2010 +0800
@@ -1372,6 +1372,7 @@ sub end_request
LJ::flush_cleanup_handlers();
LJ::disconnect_dbs() if $LJ::DISCONNECT_DBS;
LJ::MemCache::disconnect_all() if $LJ::DISCONNECT_MEMCACHE;
+ return 1;
}
# <LJFUNC>
--------------------------------------------------------------------------------
