Changeset 553

Timestamp:

Dec 15, 2015 9:40:29 PM (8 years ago)

Author:

anonymous

Message:

Minor change to caching of JS and CSS.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• CSS.inc.php (modified) (2 diffs)
• JS.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -1330 +1330 @@
     * @access   public
     * @param    string  $id             Identifier for this script.
-    * @param    mixed   $carry_args     Additional arguments to carry in the URL automatically (see $app->oHREF()).
+    * @param    mixed   $carry_args     Additional arguments to carry in the URL automatically (see $app->url()).
     * @param    string  $default_url    A default URL if there is not a valid specified boomerang URL.
     * @param    bool    $queryless_referrer_comparison   Exclude the URL query from the refererIsMe() comparison.

trunk/lib/CSS.inc.php

@@ -39 +39 @@
         'character_set' => 'utf-8',
         'cache_css' => false,
+        'cache_seconds' => 86400,
         'strip_whitespace' => false,
         'output_compression' => false,
@@ -140 +141 @@
 
         if ($this->getParam('cache_css')) {
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $latest_mtime) . ' GMT');
-            header('Cache-Control: public, max-age=86400');
+            header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
+            header(sprintf('Cache-Control: public, max-age=%s', $this->getParam('cache_seconds')));
             header('Pragma: public');
         } else {

trunk/lib/JS.inc.php

@@ -39 +39 @@
         'character_set' => 'utf-8',
         'cache_js' => false,
+        'cache_seconds' => 86400,
         'strip_whitespace' => false,
         'output_compression' => false,
@@ -140 +141 @@
 
         if ($this->getParam('cache_js')) {
-            header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $latest_mtime) . ' GMT');
-            header('Cache-Control: public, max-age=86400');
-            header('Pragma: public');
+            header(sprintf('Last-Modified: %s GMT', gmdate('D, d M Y H:i:s', $latest_mtime), null));
+            header(sprintf('Cache-Control: private, max-age=%s', $this->getParam('cache_seconds')));
+            header('Pragma: private');
         } else {
             header('Expires: -1');