Fixed a bug where CSS code was cached even when caching was disabled

Geeklog-Core · Dec 1, 2017 · ac6ef87 · ac6ef87
1 parent 5bc1983
commit ac6ef87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/system/classes/Cache.php b/system/classes/Cache.php
@@ -57,6 +57,16 @@ public static function enable()
         self::$isEnabled = false;
     }
 
+    /**
+     * Return if caching is enabled
+     *
+     * @return bool true if caching is enabled
+     */
+    public static function isEnabled()
+    {
+        return self::$isEnabled;
+    }
+
     /**
      * Clear all cached data
      */

diff --git a/system/classes/Resource.php b/system/classes/Resource.php
@@ -683,7 +683,7 @@ private function minifyCSS(array $files)
     {
         global $LANG_DIRECTION;
 
-        if ($this->debug) {
+        if ($this->debug || !Cache::isEnabled()) {
             $retval = '';
 
             foreach ($files as $file) {
@@ -1185,7 +1185,7 @@ public function getFooter()
             usort($this->externalJsFiles['footer'], array('\\Geeklog\\Resource', 'comparePriority'));
 
             foreach ($this->externalJsFiles['footer'] as $jsFile) {
-                $retval .= sprintf('<script src="%s"></script>', $jsFile['file']) . PHP_EOL;
+                $retval .= sprintf('<script src="%s" async defer></script>', $jsFile['file']) . PHP_EOL;
             }
         }