Merge pull request #209 from wp-media/branch-2.8.22

2.8.22
wp-media · Oct 18, 2016 · 04348c3 · 04348c3
2 parents e8ca27c + e2b694e
commit 04348c3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 25 deletions.
diff --git a/inc/admin/compat/cf-options-5.4.php b/inc/admin/compat/cf-options-5.4.php
@@ -0,0 +1,13 @@
+<?php defined( 'ABSPATH' ) or	die( 'Cheatin&#8217; uh?' );
+
+$cf_instance = get_rocket_cloudflare_api_instance();
+if ( ! is_wp_error( $cf_instance ) ) {
+    try {
+        $zone_instance = new CloudFlare\Zone( $cf_instance );
+    	$zone          = $zone_instance->zones( $newvalue['cloudflare_domain'] );
+
+        if ( isset( $zone->result[0]->id ) ) {
+            $newvalue['cloudflare_zone_id'] = $zone->result[0]->id;
+        }
+    } catch ( Exception $e ) {}
+}
diff --git a/inc/admin/compat/cf-upgrader-5.4.php b/inc/admin/compat/cf-upgrader-5.4.php
@@ -0,0 +1,14 @@
+<?php defined( 'ABSPATH' ) or	die( 'Cheatin&#8217; uh?' );
+
+$cf_instance = get_rocket_cloudflare_api_instance();
+if ( ! is_wp_error( $cf_instance ) ) {
+    try {
+        $zone_instance = new CloudFlare\Zone( $cf_instance );
+    	$zone          = $zone_instance->zones( $options['cloudflare_domain'] );
+
+        if ( isset( $zone->result[0]->id ) ) {
+            $options['cloudflare_zone_id'] = $zone->result[0]->id;
+            update_option( WP_ROCKET_SLUG, $options );
+        }
+    } catch ( Exception $e ) {}
+}
diff --git a/inc/admin/options.php b/inc/admin/options.php
@@ -1092,17 +1092,7 @@ function rocket_pre_main_option( $newvalue, $oldvalue ) {
 
     // Update CloudFlare zone ID if CloudFlare domain was changed
     if ( isset( $newvalue['cloudflare_domain'], $oldvalue['cloudflare_domain'] ) && $newvalue['cloudflare_domain'] != $oldvalue['cloudflare_domain'] && phpversion() >= '5.4' ) {
-        $cf_instance = get_rocket_cloudflare_api_instance();
-        if ( ! is_wp_error( $cf_instance ) ) {
-            try {
-                $zone_instance = new CloudFlare\Zone( $cf_instance );
-            	$zone          = $zone_instance->zones( $newvalue['cloudflare_domain'] );
-
-                if ( isset( $zone->result[0]->id ) ) {
-                    $newvalue['cloudflare_zone_id'] = $zone->result[0]->id;
-                }
-            } catch ( Exception $e ) {}
-        }
+        require( WP_ROCKET_ADMIN_PATH . 'compat/cf-options-5.4.php' );
     }
 
 	// Save old CloudFlare settings

diff --git a/inc/admin/upgrader.php b/inc/admin/upgrader.php
@@ -309,18 +309,7 @@ function rocket_new_upgrade( $wp_rocket_version, $actual_version ) {
     if ( version_compare( $actual_version, '2.8.21', '<' ) && phpversion() >= '5.4' ) {
         $options = get_option( WP_ROCKET_SLUG );
         if ( 0 < $options['do_cloudflare'] && $options['cloudflare_domain'] !== '' ) {
-            $cf_instance = get_rocket_cloudflare_api_instance();
-            if ( ! is_wp_error( $cf_instance ) ) {
-                try {
-                    $zone_instance = new CloudFlare\Zone( $cf_instance );
-                	$zone          = $zone_instance->zones( $options['cloudflare_domain'] );
-
-                    if ( isset( $zone->result[0]->id ) ) {
-                        $options['cloudflare_zone_id'] = $zone->result[0]->id;
-                        update_option( WP_ROCKET_SLUG, $options );
-                    }
-                } catch ( Exception $e ) {}
-            }
+            require( WP_ROCKET_ADMIN_PATH . 'compat/cf-upgrader-5.4.php' );
         }
     }
 }
diff --git a/wp-rocket.php b/wp-rocket.php
@@ -3,7 +3,7 @@
 Plugin Name: WP Rocket
 Plugin URI: https://wp-rocket.me
 Description: The best WordPress performance plugin.
-Version: 2.8.21
+Version: 2.8.22
 Code Name: Ilum
 Author: WP Media
 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.21' );
+define( 'WP_ROCKET_VERSION'             , '2.8.22' );
 define( 'WP_ROCKET_PRIVATE_KEY'         , false );
 define( 'WP_ROCKET_SLUG'                , 'wp_rocket_settings' );
 define( 'WP_ROCKET_WEB_MAIN'            , 'http://support.wp-rocket.me/' );