vadvs (vadvs) wrote in changelog,
vadvs
vadvs
changelog

[livejournal] r21867: LJSUP-12051: Enable js/css concatenation...

Committer: vad
LJSUP-12051: Enable js/css concatenation for SSL pages
U   trunk/cgi-bin/Apache/LiveJournal.pm
Modified: trunk/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- trunk/cgi-bin/Apache/LiveJournal.pm	2012-05-02 13:15:37 UTC (rev 21866)
+++ trunk/cgi-bin/Apache/LiveJournal.pm	2012-05-02 13:18:18 UTC (rev 21867)
@@ -382,7 +382,10 @@
 
     ## JS/CSS file concatenation
     ## skip it for .bml.
-    if ($host eq "stat.$LJ::DOMAIN" and LJ::Request->uri !~ /\.bml$/){
+    if (
+        ($host eq "stat.$LJ::DOMAIN" and LJ::Request->uri !~ /\.bml$/) or
+        ($LJ::IS_SSL and LJ::Request->unparsed_uri =~ /\?\?/)
+    ){
         Apache::LiveJournal::ConcatHeadFiles->load;
         LJ::Request->handler("perl-script");
         LJ::Request->set_handlers(PerlHandler => \&Apache::LiveJournal::ConcatHeadFiles::handler);

Tags: livejournal, pm, vad, vadvs
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