wisest owl (wisest_owl) wrote in changelog,
wisest owl
wisest_owl
changelog

[livejournal] r16130: LJSUP-5445

Committer: gprochaev
LJSUP-5445

U   trunk/cgi-bin/ljlib.pl
U   trunk/cgi-bin/weblib.pl
Modified: trunk/cgi-bin/ljlib.pl
===================================================================
--- trunk/cgi-bin/ljlib.pl	2010-01-25 09:14:25 UTC (rev 16129)
+++ trunk/cgi-bin/ljlib.pl	2010-01-25 09:28:42 UTC (rev 16130)
@@ -2110,7 +2110,7 @@
 
     # include standard files if this is web-context
     unless ($LJ::DISABLED{sitewide_includes}) {
-        if (eval { LJ::Request->instance }) {
+        if (LJ::Request->is_inited) {
             # standard site-wide JS and CSS
             # jQuery always should be the first in the list
             LJ::need_res(qw(

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2010-01-25 09:14:25 UTC (rev 16129)
+++ trunk/cgi-bin/weblib.pl	2010-01-25 09:28:42 UTC (rev 16130)
@@ -2027,7 +2027,7 @@
 sub need_res {
     my $opts = (ref $_[0]) ? shift : {};
     my $condition = $opts->{condition} || '';
-    
+
     foreach my $reskey (@_) {
         die "Bogus reskey $reskey" unless $reskey =~ m!^(js|stc)/!;
         unless (exists $LJ::NEEDED_RES{$reskey}) {

Tags: livejournal, pl, wisest-owl
Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments