From e6ad0029f3d2689d4cc1222fcff4e050f87dbd34 Mon Sep 17 00:00:00 2001
From: Peter Molnar
Date: Wed, 20 Mar 2013 17:43:29 +0000
Subject: [PATCH] removed default: sections; corrected log default value bug
cause by migration
---
wp-ffpc-admin.css | 10 ++--------
wp-ffpc-class.php | 29 ++++++++---------------------
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/wp-ffpc-admin.css b/wp-ffpc-admin.css
index 6ebafcb..2b06d3d 100644
--- a/wp-ffpc-admin.css
+++ b/wp-ffpc-admin.css
@@ -15,15 +15,9 @@
visibility: hidden;
}
-.plugin-admin .default {
- display:block;
- padding-left: 1em;
- font-size:90%;
- color:#666;
-}
-
.plugin-admin .description {
- display:block;
+ display: block;
+ padding-top: 0.3em;
}
.plugin-admin .tabs {
diff --git a/wp-ffpc-class.php b/wp-ffpc-class.php
index f4e29d5..a5142b5 100644
--- a/wp-ffpc-class.php
+++ b/wp-ffpc-class.php
@@ -292,7 +292,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
print_select_options ( $this->select_cache_type , $this->options['cache_type'], $this->valid_cache_type ) ?>
plugin_constant); ?>
- print_default ( 'cache_type' ); ?>
@@ -301,7 +300,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
plugin_constant); ?>
- print_default ( 'expire' ); ?>
@@ -310,7 +308,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
plugin_constant); ?>
- print_default ( 'charset' ); ?>
@@ -321,7 +318,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
print_select_options ( $this->select_invalidation_method , $this->options['invalidation_method'] ) ?>
Be careful! Selecting "flush cache" will flush the whole cache, including elements that might have been set and used by other applications. Also, invalidating only the post will _not_ clear categories, archive and taxonomy pages, therefore only use this if refreshing after publish can wait until the entries expire on their own.
', $this->plugin_constant); ?>
- print_default ( 'invalidation_method' ); ?>
@@ -330,7 +326,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
plugin_constant); ?>
- print_default ( 'prefix_data' ); ?>
@@ -339,7 +334,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
plugin_constant); ?>
- print_default ( 'prefix_meta' ); ?>
@@ -353,7 +347,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['log'],true); ?> />
plugin_constant); ?>
- print_default ( 'log' ); ?>
@@ -362,7 +355,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['log_info'],true); ?> />
plugin_constant); ?>
- print_default ( 'log_info' ); ?>
@@ -371,7 +363,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['response_header'],true); ?> />
plugin_constant); ?>
- print_default ( 'response_header' ); ?>
@@ -380,7 +371,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['sync_protocols'],true); ?> />
plugin_constant); ?>
- print_default ( 'sync_protocols' ); ?>
@@ -395,7 +385,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['cache_loggedin'],true); ?> />
plugin_constant); ?>
- print_default ( 'cache_loggedin' ); ?>
@@ -404,7 +393,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['nocache_home'],true); ?> />
plugin_constant); ?>
- print_default ( 'nocache_home' ); ?>
+
@@ -413,7 +402,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['nocache_feed'],true); ?> />
plugin_constant); ?>
- print_default ( 'nocache_feed' ); ?>
@@ -422,7 +410,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['nocache_archive'],true); ?> />
plugin_constant); ?>
- print_default ( 'nocache_archive' ); ?>
@@ -431,7 +418,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['nocache_single'],true); ?> />
plugin_constant); ?>
- print_default ( 'nocache_single' ); ?>
@@ -440,7 +426,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['nocache_page'],true); ?> />
plugin_constant); ?>
- print_default ( 'nocache_page' ); ?>
@@ -454,7 +439,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
No spaces are allowed, please stick to use ":" for separating host and port and "," for separating entries. Do not add trailing ",".', $this->plugin_constant); ?>
- print_default ( 'hosts' ); ?>
plugin_constant); ?>
@@ -462,7 +446,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['persistent'],true); ?> />
plugin_constant); ?>
- print_default ( 'persistent' ); ?>
@@ -555,18 +538,22 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
/* updating from version 0.4.x */
if ( !empty ( $options['host'] ) ) {
$options['hosts'] = $options['host'] . ':' . $options['port'];
+ /* renamed options */
+ $options['log'] = $options['syslog'];
+ $options['response_header'] = $options['debug'];
}
/* migrating from version 0.6.x */
elseif ( is_array ( $options ) && array_key_exists ( $this->global_config_key , $options ) ) {
$options = $options[ $this->global_config_key ];
+ /* renamed options */
+ $options['log'] = $options['syslog'];
+ $options['response_header'] = $options['debug'];
}
/* migrating from something, drop previous config */
else {
$options = array();
}
- /* renamed options */
- $options['log'] = $options['syslog'];
- $options['response_header'] = $options['debug'];
+
}
}