mfunc fix (#1222)

* Fix issue with mfunc processing stripping the digit "1" if the constant is set to 1 or true.
* Add a check to skip execution of mfunc/mclude code if the constant is set to 0, 1, or true.

Author: jacobd91

Generic_Plugin.php

@@ -210,7 +210,7 @@ private function sanitize_dynamic_fragment_data( $data ) {
 	 * @return string
 	 */
 	private function strip_dynamic_fragment_tags_from_string( $value ) {
-		if ( ! is_string( $value ) || ! defined( 'W3TC_DYNAMIC_SECURITY' ) || '' === W3TC_DYNAMIC_SECURITY ) {
+		if ( ! is_string( $value ) || ! defined( 'W3TC_DYNAMIC_SECURITY' ) || empty( W3TC_DYNAMIC_SECURITY ) ) {
 			return $value;
 		}
 
@@ -226,6 +226,11 @@ private function strip_dynamic_fragment_tags_from_string( $value ) {
 			$value = $original;
 		}
 
+		// The W3TC_DYNAMIC_SECURITY constant should be a unique string and not an int or boolean.
+		if ( 1 === (int) W3TC_DYNAMIC_SECURITY ) {
+			return $value;
+		}
+
 		return str_replace( W3TC_DYNAMIC_SECURITY, '', $value );
 	}
 

PgCache_ContentGrabber.php

@@ -2084,7 +2084,8 @@ public function _bad_behavior() {
 	 * @return string The buffer with parsed dynamic content.
 	 */
 	public function _parse_dynamic( $buffer ) {
-		if ( ! defined( 'W3TC_DYNAMIC_SECURITY' ) ) {
+		// The W3TC_DYNAMIC_SECURITY constant should be a unique string and not an int or boolean.
+		if ( ! defined( 'W3TC_DYNAMIC_SECURITY' ) || empty( W3TC_DYNAMIC_SECURITY ) || 1 === (int) W3TC_DYNAMIC_SECURITY ) {
 			return $buffer;
 		}