Merge pull request #99 from wp-media/fix/wp-engine-empty-cdn-issue

Fix WPEngine CDN issue
wp-media · Jul 9, 2016 · 21a05de · 21a05de
2 parents c709017 + 803a550
commit 21a05de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/inc/3rd-party/hosting/wpengine.php b/inc/3rd-party/hosting/wpengine.php
@@ -38,7 +38,6 @@ function __rocket_run_rocket_bot_after_wpengine() {
  */
 add_filter( 'get_rocket_option_cdn', '__rocket_auto_activate_cdn_on_wpengine' );
 function __rocket_auto_activate_cdn_on_wpengine( $value ) {
-
 	$cdn_domain = rocket_get_wp_engine_cdn_domain();
 
 	if ( ! empty( $cdn_domain ) ) {
@@ -50,7 +49,6 @@ function __rocket_auto_activate_cdn_on_wpengine( $value ) {
 
 add_filter( 'rocket_cdn_cnames', '__rocket_add_wpengine_cdn_cnames' );
 function __rocket_add_wpengine_cdn_cnames( $hosts ) {
-
 	$cdn_domain = rocket_get_wp_engine_cdn_domain();
 
 	if ( ! empty( $cdn_domain ) ) {
@@ -119,7 +117,9 @@ function rocket_get_wp_engine_cdn_domain() {
     $wpengine   = WpeCommon::instance();
     $cdn_domain = $wpengine->get_cdn_domain( $domains, home_url(), $is_ssl );
 
-    $cdn_domain = $native_schema . '://' . $cdn_domain;
+    if ( ! empty( $cdn_domain ) ) {
+		$cdn_domain = $native_schema . '://' . $cdn_domain;
+    }
 
     return $cdn_domain;
 }

diff --git a/wp-rocket.php b/wp-rocket.php
@@ -3,7 +3,7 @@
 Plugin Name: WP Rocket
 Plugin URI: http://www.wp-rocket.me
 Description: The best WordPress performance plugin.
-Version: 2.8.7
+Version: 2.8.8
 Code Name: Ilum
 Author: WP Rocket
 Contributors: Jonathan Buttigieg, Julio Potier, Remy Perona
@@ -19,7 +19,7 @@
 defined( 'ABSPATH' ) or die( 'Cheatin&#8217; uh?' );
 
 // Rocket defines
-define( 'WP_ROCKET_VERSION'             , '2.8.7' );
+define( 'WP_ROCKET_VERSION'             , '2.8.8' );
 define( 'WP_ROCKET_PRIVATE_KEY'         , false );
 define( 'WP_ROCKET_SLUG'                , 'wp_rocket_settings' );
 define( 'WP_ROCKET_WEB_MAIN'            , 'http://support.wp-rocket.me/' );