Merge branch 'master' of github.com:bluehost/endurance-page-cache

Author: wpscholar

README.md

@@ -1 +1,9 @@
-# endurance-page-cache
+<a href="https://endurance.com/">
+    <img src="https://bluehost.com/resources/logos/endurance.svg" alt="Endurance Logo" title="Endurance" align="right" height="42" />
+</a>
+
+# Endurance Page Cache
+[![Version Number](https://img.shields.io/github/v/release/bluehost/endurance-page-cache?color=21a0ed&labelColor=333333)](https://github.com/bluehost/endurance-page-cache/releases)
+[![License](https://img.shields.io/github/license/bluehost/endurance-page-cache?labelColor=333333&color=666666)](https://raw.githubusercontent.com/bluehost/endurance-page-cache/master/license.txt)
+
+Endurance Page Cache adds basic file-based caching to WordPress, as well as more advanced caching solutions in nginx and Cloudflare. EPC is designed to run best on Endurance systems and your mileage may vary.

endurance-page-cache.php

@@ -71,13 +71,6 @@ class Endurance_Page_Cache {
 		 */
 		public $cloudflare_tier = 'basic';
 
-		/**
-		 * Brands supporting cloudflare (from mm_brand option).
-		 *
-		 * @var array
-		 */
-		public $cloudflare_support = array( 'BlueHost' );
-
 		/**
 		 * Whether or not to force a purge.
 		 *
@@ -1487,10 +1480,7 @@ protected function get_triggers( $include_duplicates = false ) {
 		protected function udev_cache_purge( $resources = array(), $override_services = array() ) {
 			global $wp_version;
 
-			$brand = get_option( 'mm_brand' );
-
 			if ( $this->use_file_cache()
-				|| ! in_array( $brand, $this->cloudflare_support, true )
 				|| false === $this->cloudflare_enabled
 			) {
 				return;
@@ -1503,10 +1493,10 @@ protected function udev_cache_purge( $resources = array(), $override_services =
 			}
 
 			$hosts    = array( wp_parse_url( home_url(), PHP_URL_HOST ) );
-			$services = ! empty( $override_services ) ? $override_services : self::$udev_api_services;
+			$services = ! empty( $override_services ) ? $override_services : $this->udev_api_services;
 
 			if ( $services['cf'] && $this->cloudflare_enabled ) {
-				$services['cf'] = $this->cloudflare_enabled;
+				$services['cf'] = $this->cloudflare_tier;
 			}
 
 			wp_remote_post(