M readme.txt → readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XU3DG7LLA76WC
 Tags: cache, page cache, full page cache, nginx, memcached, apc, speed
 Requires at least: 3.0
 Tested up to: 4.0
-Stable tag: 1.6.1
+Stable tag: 1.6.2
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -106,6 +106,12 @@ * every A. indicates BIG changes.
 * every .B version indicates new features.
 * every ..C indicates bugfixes for A.B version.
 
+= 1.6.2 =
+*2014-09-05*
+
+* merge pulled from [plescheff](https://github.com/petermolnar/wp-ffpc/pull/25)
+* fixed bug of alway-on log messages ( warning was set to default where notice should have been )
+
 = 1.6.1 =
 *2014-09-04*
 
@@ -122,6 +128,7 @@
 What's fixed:
 
 * some warning messages removed in case there's not a single backend installed when the plugin is activated
+* fixed issue of resetting settings when new version of defaults was released
 
 Under the hood:
 

M wp-ffpc-acache.php → wp-ffpc-acache.php

@@ -25,6 +25,7 @@
 /* request uri */
 $wp_ffpc_uri = $_SERVER['REQUEST_URI'];
 
+
 /* no cache for uri with query strings, things usually go bad that way */
 if ( isset($wp_ffpc_config['nocache_dyn']) && !empty($wp_ffpc_config['nocache_dyn']) && stripos($wp_ffpc_uri, '?') !== false )
 	return false;
@@ -74,11 +75,13 @@ return false;
 	}
 }
 
+
 /* canonical redirect storage */
 $wp_ffpc_redirect = null;
 /* fires up the backend storage array with current config */
 include_once ('wp-ffpc-backend.php');
 $wp_ffpc_backend = new WP_FFPC_Backend( $wp_ffpc_config );
+
 
 /* no cache for for logged in users unless it's set
    identifier cookies are listed in backend as var for easier usage
@@ -94,6 +97,7 @@ }
 	}
 
 }
+
 
 /* will store time of page generation */
 $wp_ffpc_gentime = 0;

M wp-ffpc-backend.php → wp-ffpc-backend.php

@@ -461,7 +461,7 @@ *
 	 * @var mixed $message Message to log
 	 * @var int $log_level Log level
 	 */
-	private function log ( $message, $log_level = LOG_WARNING ) {
+	private function log ( $message, $log_level = LOG_NOTICE ) {
 		if ( !isset ( $this->options['log'] ) || $this->options['log'] != 1 )
 			return false;
 		else

M wp-ffpc.php → wp-ffpc.php

@@ -3,7 +3,7 @@ /*
 Plugin Name: WP-FFPC
 Plugin URI: https://github.com/petermolnar/wp-ffpc
 Description: WordPress in-memory full page cache plugin
-Version: 1.6.1
+Version: 1.6.2
 Author: Peter Molnar <hello@petermolnar.eu>
 Author URI: http://petermolnar.eu/
 License: GPLv3