Changeset 554

Timestamp:

Dec 15, 2015 9:50:28 PM (8 years ago)

Author:

anonymous

Message:

Renamed params cache_js and cache_css to cache_enable

Location:

trunk/lib

Files:

• CSS.inc.php (modified) (3 diffs)
• JS.inc.php (modified) (3 diffs)

trunk/lib/CSS.inc.php

@@ -38 +38 @@
     protected $_params = array(
         'character_set' => 'utf-8',
-        'cache_css' => false,
+        'cache_enable' => false,
+        'cache_css' => null, // Same as above; kept for backwards compatibility.
         'cache_seconds' => 86400,
         'strip_whitespace' => false,
@@ -57 +58 @@
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
+            // Maintaining backwards compatibility.
+            if (isset($params['cache_css']) && !isset($params['cache_enable'])) {
+                $this->_params['cache_enable'] = $params['cache_css'];
+            }
         } else {
             $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
@@ -140 +145 @@
         }
 
-        if ($this->getParam('cache_css')) {
+        if ($this->getParam('cache_enable')) {
             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')));

trunk/lib/JS.inc.php

@@ -38 +38 @@
     protected $_params = array(
         'character_set' => 'utf-8',
-        'cache_js' => false,
+        'cache_enable' => false,
+        'cache_js' => null, // Same as above; kept for backwards compatibility.
         'cache_seconds' => 86400,
         'strip_whitespace' => false,
@@ -57 +58 @@
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
+            // Maintaining backwards compatibility.
+            if (isset($params['cache_js']) && !isset($params['cache_enable'])) {
+                $this->_params['cache_enable'] = $params['cache_js'];
+            }
         } else {
             $app->logMsg(sprintf('Parameters are not an array: %s', $params), LOG_ERR, __FILE__, __LINE__);
@@ -140 +145 @@
         }
 
-        if ($this->getParam('cache_js')) {
+        if ($this->getParam('cache_enable')) {
             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')));