Merge branch 'dev' into 'master'

Dev

See merge request !20

includes/Cache.php

@@ -31,11 +31,6 @@ class Cache
     {
         $this->setCacheFiles();
 
-        if (apply_filters('rrzecache_skip_cache', false)) {
-            Flush::flushCache();
-            return;
-        }
-
         add_action('init', [$this, 'add_publish_hooks'], 99);
         add_action('pre_comment_approved', [$this, 'pre_comment_approved'], 99, 2);
         add_action('transition_comment_status', [$this, 'transition_comment_status'], 10, 3);
@@ -276,6 +271,10 @@ class Cache
             return true;
         }
 
+        if (apply_filters('rrzecache_skip_cache', false)) {
+            return true;
+        }
+
         if (is_search() || is_404() || is_feed() || is_trackback() || is_robots() || is_preview() || post_password_required()) {
             return true;
         }

includes/File.php

@@ -197,7 +197,7 @@ final class File
     protected static function createFiles(string $data): bool
     {
         $filePath = self::filePath();
-        if (!wp_mkdir_p($filePath)) {
+        if (!$filePath || !wp_mkdir_p($filePath)) {
             do_action('rrze.log.error', __('{plugin}: The directory could not be created.', 'rrze-cache'), ['plugin' => 'rrze-cache', 'method' => __METHOD__, '$filePath' => $filePath]);
             return false;
         }
@@ -252,7 +252,6 @@ final class File
             parse_url('http://' . strtolower($_SERVER['HTTP_HOST']), PHP_URL_HOST);
 
         if (validate_file($path) > 0) {
-            do_action('rrze.log.error', __('{plugin}: Invalid file path.'), ['plugin' => 'rrze-cache', 'method' => __METHOD__, '$path' => $path]);
             return false;
         }
 
@@ -272,7 +271,6 @@ final class File
             parse_url(($path ? $path : $_SERVER['REQUEST_URI']), PHP_URL_PATH);
 
         if (validate_file($path) > 0) {
-            do_action('rrze.log.error', __('{plugin}: Invalid file path.', 'rrze-cache'), ['plugin' => 'rrze-cache', 'method' => __METHOD__, '$path' => $path]);
             return false;
         }
 

rrze-cache.php

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Cache
 Plugin URI:      https://gitlab.rrze.fau.de/rrze-webteam/rrze-cache
 Description:     Advanced cache management.
-Version:         2.7.2
+Version:         2.7.3
 Author:          RRZE-Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License v2