Commit 4f3f6e51 authored by Rolf Forst's avatar Rolf Forst
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request !19
parents b8920794 9590a590
...@@ -31,12 +31,17 @@ class Cache ...@@ -31,12 +31,17 @@ class Cache
{ {
$this->setCacheFiles(); $this->setCacheFiles();
if (apply_filters('rrzecache_skip_cache', false)) {
Flush::flushCache();
return;
}
add_action('init', [$this, 'add_publish_hooks'], 99); add_action('init', [$this, 'add_publish_hooks'], 99);
add_action('pre_comment_approved', [$this, 'pre_comment_approved'], 99, 2); add_action('pre_comment_approved', [$this, 'pre_comment_approved'], 99, 2);
add_action('transition_comment_status', [$this, 'transition_comment_status'], 10, 3); add_action('transition_comment_status', [$this, 'transition_comment_status'], 10, 3);
add_action('edit_comment', [$this, 'edit_comment']); add_action('edit_comment', [$this, 'edit_comment']);
add_action('post_submitbox_misc_actions', [$this, 'post_cache_submitbox'], 99); add_action('post_submitbox_misc_actions', [$this, 'post_cache_submitbox'], 99);
add_action('template_redirect', [$this, 'template_redirect'], 0); add_action('template_redirect', [$this, 'template_redirect'], 1);
add_action('rrzecache_flush_cache_post_id', [__NAMESPACE__ . '\Flush', 'flushCacheByPostId']); add_action('rrzecache_flush_cache_post_id', [__NAMESPACE__ . '\Flush', 'flushCacheByPostId']);
add_action('rrzecache_flush_cache_url', [__NAMESPACE__ . '\Flush', 'flushCacheByUrl']); add_action('rrzecache_flush_cache_url', [__NAMESPACE__ . '\Flush', 'flushCacheByUrl']);
...@@ -185,7 +190,7 @@ class Cache ...@@ -185,7 +190,7 @@ class Cache
</div> </div>
<?php endif ?> <?php endif ?>
</div> </div>
<?php <?php
} }
public function template_redirect() public function template_redirect()
...@@ -271,10 +276,6 @@ class Cache ...@@ -271,10 +276,6 @@ class Cache
return true; 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()) { if (is_search() || is_404() || is_feed() || is_trackback() || is_robots() || is_preview() || post_password_required()) {
return true; return true;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Plugin Name: RRZE Cache Plugin Name: RRZE Cache
Plugin URI: https://gitlab.rrze.fau.de/rrze-webteam/rrze-cache Plugin URI: https://gitlab.rrze.fau.de/rrze-webteam/rrze-cache
Description: Advanced cache management. Description: Advanced cache management.
Version: 2.7.1 Version: 2.7.2
Author: RRZE-Webteam Author: RRZE-Webteam
Author URI: https://blogs.fau.de/webworking/ Author URI: https://blogs.fau.de/webworking/
License: GNU General Public License v2 License: GNU General Public License v2
...@@ -19,7 +19,7 @@ namespace RRZE\Cache; ...@@ -19,7 +19,7 @@ namespace RRZE\Cache;
defined('ABSPATH') || exit; defined('ABSPATH') || exit;
const RRZE_PHP_VERSION = '7.4'; const RRZE_PHP_VERSION = '7.4';
const RRZE_WP_VERSION = '5.5'; const RRZE_WP_VERSION = '5.8';
const RRZECACHE_META_KEY = '_rrze_cache'; const RRZECACHE_META_KEY = '_rrze_cache';
const ACCESS_PERMISSION_META_KEY = '_access_permission'; // rrze-ac plugin const ACCESS_PERMISSION_META_KEY = '_access_permission'; // rrze-ac plugin
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment