Fix out-of-order loading issue causing weblib to load before ljconfig.
This solution actually works, mine last night broke events. Thanks for
debugging and fixing, Jen\!
Patch by kareila.
diffs (50 lines):
diff -r 37e21c1de59d -r 8614f9d218b5 cgi-bin/LJ/NotificationMethod/DebugLog.pm
--- a/cgi-bin/LJ/NotificationMethod/DebugLog.pm Mon Jul 27 15:43:13 2009 -0500
+++ b/cgi-bin/LJ/NotificationMethod/DebugLog.pm Tue Jul 28 05:28:15 2009 +0000
@@ -4,7 +4,7 @@ use Carp qw/ croak /;
use Carp qw/ croak /;
use base 'LJ::NotificationMethod';
use lib "$LJ::HOME/cgi-bin";
-#require "weblib.pl";
+require "weblib.pl";
sub can_digest { 1 };
diff -r 37e21c1de59d -r 8614f9d218b5 cgi-bin/LJ/NotificationMethod/Email.pm
--- a/cgi-bin/LJ/NotificationMethod/Email.pm Mon Jul 27 15:43:13 2009 -0500
+++ b/cgi-bin/LJ/NotificationMethod/Email.pm Tue Jul 28 05:28:15 2009 +0000
@@ -5,7 +5,7 @@ use base 'LJ::NotificationMethod';
use base 'LJ::NotificationMethod';
use lib "$LJ::HOME/cgi-bin";
-#require "weblib.pl";
+require "weblib.pl";
sub can_digest { 1 };
diff -r 37e21c1de59d -r 8614f9d218b5 cgi-bin/modperl_subs.pl
--- a/cgi-bin/modperl_subs.pl Mon Jul 27 15:43:13 2009 -0500
+++ b/cgi-bin/modperl_subs.pl Tue Jul 28 05:28:15 2009 +0000
@@ -8,6 +8,9 @@ package LJ;
package LJ;
use Apache2::ServerUtil ();
+
+use LJ::Config;
+BEGIN { LJ::Config->load; }
use Apache::LiveJournal;
use Apache::BML;
@@ -42,12 +45,10 @@ use Class::Autouse qw(
MogileFS::Client
DDLockClient
LJ::BetaFeatures
- LJ::Config
DW::InviteCodes
DW::InviteCodeRequests
);
-LJ::Config->load;
# force XML::Atom::* to be brought in (if we have it, it's optional),
# unless we're in a test.
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
