ssafronova (ssafronova) wrote in changelog,
ssafronova
ssafronova
changelog

[livejournal] r17405: LJSUP-6110, LJSUP-6856 - include resourc...

Committer: ssafronova
LJSUP-6110, LJSUP-6856 - include resources after conditions are complete
U   trunk/cgi-bin/ljlib.pl
U   trunk/cgi-bin/weblib.pl
Modified: trunk/cgi-bin/ljlib.pl
===================================================================
--- trunk/cgi-bin/ljlib.pl	2010-09-20 00:54:21 UTC (rev 17404)
+++ trunk/cgi-bin/ljlib.pl	2010-09-20 03:07:27 UTC (rev 17405)
@@ -2191,8 +2191,6 @@
                             )
             ) if LJ::show_contextual_hover();
 
-            LJ::run_hooks('sitewide_resources');
-
             # Conditional IE CSS file for all pages 
             LJ::need_res({condition => 'IE'}, 'stc/ie.css');
         }

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2010-09-20 00:54:21 UTC (rev 17404)
+++ trunk/cgi-bin/weblib.pl	2010-09-20 03:07:27 UTC (rev 17405)
@@ -1279,6 +1279,10 @@
     my $ret = "";
     my $do_concat = $LJ::IS_SSL ? $LJ::CONCAT_RES_SSL : $LJ::CONCAT_RES;
 
+    # all conditions must be complete here
+    # example: cyr/non-cyr flag changed at settings page
+    LJ::run_hooks('sitewide_resources');
+
     # use correct root and prefixes for SSL pages
     my ($siteroot, $imgprefix, $statprefix, $jsprefix, $wstatprefix);
     if ($LJ::IS_SSL) {

Tags: livejournal, pl, ssafronova
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