From 0e5c555af2263eadc45ccc3ae4c78b3b0213df8e Mon Sep 17 00:00:00 2001
From: Erick Hitter <ehitter@gmail.com>
Date: Thu, 27 Feb 2014 17:08:25 -0800
Subject: [PATCH] When retrieving settings from options, overwrite global
values so everyone's on the same page. :)
---
index-redis-page-cache.php | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/index-redis-page-cache.php b/index-redis-page-cache.php
index 77664b5..c770ecd 100644
--- a/index-redis-page-cache.php
+++ b/index-redis-page-cache.php
@@ -336,29 +336,23 @@ try {
// Cache rendered page if appropriate
if ( ! is_404() && ! is_search() ) {
// Is unlimited cache life requested?
- if ( isset( $redis_page_cache_config['unlimited'] ) ) {
- $unlimited = $redis_page_cache_config['unlimited'];
- } else {
- $unlimited = (bool) get_option( 'redis-page-cache-debug', false );
- $redis_page_cache_config['unlimited'] = $unlimited;
+ if ( ! isset( $redis_page_cache_config['unlimited'] ) ) {
+ $redis_page_cache_config['unlimited'] = (bool) get_option( 'redis-page-cache-debug', false );
}
// Cache the page for the chosen duration
- if ( $unlimited ) {
+ if ( $redis_page_cache_config['unlimited'] ) {
$redis->set( $redis_page_cache_config['redis_key'], $markup_to_cache );
} else {
- if ( isset( $redis_page_cache_config['cache_duration'] ) ) {
- $cache_duration = $redis_page_cache_config['cache_duration'];
- } else {
- $cache_duration = (int) get_option( 'redis-page-cache-seconds', 43200 );
- $redis_page_cache_config['cache_duration'] = $cache_duration;
+ if ( ! isset( $redis_page_cache_config['cache_duration'] ) ) {
+ $redis_page_cache_config['cache_duration'] = (int) get_option( 'redis-page-cache-seconds', 43200 );
}
- if ( ! is_numeric( $cache_duration ) ) {
- $cache_duration = $redis_page_cache_config['cache_duration'] = 43200;
+ if ( ! is_numeric( $redis_page_cache_config['cache_duration'] ) ) {
+ $redis_page_cache_config['cache_duration'] = 43200;
}
- $redis->setex( $redis_page_cache_config['redis_key'], $cache_duration, $markup_to_cache );
+ $redis->setex( $redis_page_cache_config['redis_key'], $redis_page_cache_config['cache_duration'], $markup_to_cache );
}
}
}
--
GitLab