Merge pull request #141 from wp-media/branch-2.8.11

2.8.11

Author: GeekPress

inc/3rd-party/3rd-party.php

@@ -33,3 +33,4 @@
 require( WP_ROCKET_3RD_PARTY_PATH . 'all-in-one-seo-pack.php' );
 require( WP_ROCKET_3RD_PARTY_PATH . 'wp-rest-api.php' );
 require( WP_ROCKET_3RD_PARTY_PATH . 'page-builder/beaver-builder.php' );
+require( WP_ROCKET_3RD_PARTY_PATH . 'page-builder/thrive-visual-editor.php' );

inc/3rd-party/buddypress.php

@@ -24,4 +24,22 @@ function __deactivate_rocket_lazyload_on_buddypress_profil_pages( $run_filter )
 	return $run_filter;
 }
 
+/**
+ * Excludes BuddyPress's plupload from JS minification
+ *
+ * Exclude it to prevent an error after minification/concatenation preventing the image upload from working correctly
+ *
+ * @since 2.8.10
+ * @author Remy Perona
+ *
+ * @param Array $excluded_handle An array of JS handles enqueued in WordPress
+ * @return Array the updated array of handles
+ */
+add_filter( 'rocket_excluded_handle_js', '__rocket_exclude_js_buddypress' );
+function __rocket_exclude_js_buddypress( $excluded_handle ) {
+    $excluded_handle[] = 'bp-plupload';
+
+    return $excluded_handle;
+}
+
 endif;

inc/3rd-party/page-builder/thrive-visual-editor.php

@@ -0,0 +1,15 @@
+<?php 
+defined( 'ABSPATH' ) or die( 'Cheatin\' uh?' );
+
+if ( function_exists( 'tve_editor_url' ) ) {
+    /**
+     * Forces Thrive Visual Editor’s bot detection to assume a human visitor.
+     *
+     * @since 2.8.11
+     * @author Remy Perona
+     *
+     * @param  boolean|integer $bot_detection 1|0 when crawler has|not been detected, FALSE when user agent string is unavailable
+     * @return integer
+     */
+    add_filter( 'tve_dash_is_crawler', '__return_zero', PHP_INT_MAX );
+}

inc/admin/ui/js/options.js

@@ -218,6 +218,8 @@ jQuery( document ).ready( function($){
 					if( response.msg == 'SUCCESS' ) {
 						title = sawpr.successSupportTitle;
 						text  = sawpr.successSupportText;
+						confirmButtonText = 'OK';
+						confirmButtonColor = '#3085d6';
 						type  = "success";
 
 						// Reset the values

inc/admin/upgrader.php

@@ -35,6 +35,11 @@ function rocket_upgrader() {
 		}
 
 		update_option( WP_ROCKET_SLUG, $options );
+
+        // Empty OPCache to prevent issue where plugin is updated but still showing as old version in WP admin
+        if ( function_exists( 'opcache_reset' ) ) {
+            opcache_reset();
+        }
 	} else {
 		if ( empty( $_POST ) && rocket_valid_key() ) {
 			rocket_check_key( 'transient_30' );

inc/common/purge.php

@@ -164,8 +164,19 @@ function rocket_clean_post( $post_id ) {
 	// Add urls page to purge every time a post is save
 	$cache_purge_pages = get_rocket_option( 'cache_purge_pages' );
 	if ( $cache_purge_pages ) {
+        global $blog_id;
+
+        $home_url = get_option( 'home' );
+
+        if ( ! empty( $blog_id ) && is_multisite() ) {
+            switch_to_blog( $blog_id );
+            $home_url = get_option( 'home' );
+            restore_current_blog();
+        }
+
 		foreach( $cache_purge_pages as $page ) {
-			array_push( $purge_urls, home_url( $page ) );
+    		$page = trailingslashit( $home_url ) . $page;
+			array_push( $purge_urls, $page );
 		}
 	}
 

inc/front/process.php

@@ -169,6 +169,15 @@
 	if ( $detect->isMobile() && ! $detect->isTablet() ) {
 		$filename .= '-mobile';
 	}
+
+    if ( strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false ) {
+        // Create a hidden empty file for mobile detection on NGINX with the Rocket NGINX configuration
+        $nginx_mobile_detect_file = $request_uri_path . '/.mobile-active';
+        
+        if ( ! file_exists( $nginx_mobile_detect_file ) ) {
+            touch( $nginx_mobile_detect_file );
+        }
+    }
 }
 
 // Rename the caching filename for SSL URLs

inc/functions/files.php

@@ -455,7 +455,7 @@ function rocket_clean_home( $lang = '' ) {
 
 	// Delete homepage
 	if ( $files = glob( $root . '/{index,index-*}.{html,html_gzip}', GLOB_BRACE|GLOB_NOSORT ) ) {
-		foreach ( $files as $file ) { // no array map to use @
+		foreach ( $files as $file ) { // no array map to use @	
 			@unlink( $file );
 		}
 	}
@@ -466,6 +466,13 @@ function rocket_clean_home( $lang = '' ) {
 			rocket_rrmdir( $dir );
 		}
 	}
+
+    // Remove the hidden empty file for mobile detection on NGINX with the Rocket NGINX configuration
+    if ( $nginx_mobile_detect_files = glob( $root . '/.mobile-active', GLOB_BRACE|GLOB_NOSORT ) ) {
+        foreach ( $nginx_mobile_detect_files as $nginx_mobile_detect_file ) { // no array map to use @
+			@unlink( $nginx_mobile_detect_file );
+		}
+    }
 
 	/**
 	 * Fires after the home cache file was deleted
@@ -760,7 +767,7 @@ function rocket_rrmdir( $dir, $dirs_to_preserve = array() ) {
 	$dir = untrailingslashit( $dir );
 
 	/**
-	 * Fires after a file/directory cache was deleted
+	 * Fires before a file/directory cache is deleted
 	 *
 	 * @since 1.1.0
 	 *
@@ -769,6 +776,13 @@ function rocket_rrmdir( $dir, $dirs_to_preserve = array() ) {
 	*/
 	do_action( 'before_rocket_rrmdir', $dir, $dirs_to_preserve );
 
+    // Remove the hidden empty file for mobile detection on NGINX with the Rocket NGINX configuration
+    $nginx_mobile_detect_file = $dir . '/.mobile-active';
+
+    if ( file_exists( $nginx_mobile_detect_file ) ) {
+        @unlink( $nginx_mobile_detect_file );
+    }
+
 	if ( ! is_dir( $dir ) ) {
 		@unlink( $dir );
 		return;
@@ -795,7 +809,7 @@ function rocket_rrmdir( $dir, $dirs_to_preserve = array() ) {
 	@rmdir($dir);
 
 	/**
-	 * Fires before a file/directory cache was deleted
+	 * Fires after a file/directory cache was deleted
 	 *
 	 * @since 1.1.0
 	 *

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.10
+Version: 2.8.11
 Code Name: Ilum
 Author: WP Rocket
 Contributors: Jonathan Buttigieg, Julio Potier, Remy Perona
@@ -19,7 +19,7 @@
 defined( 'ABSPATH' ) or die( 'Cheatin’ uh?' );
 
 // Rocket defines
-define( 'WP_ROCKET_VERSION'             , '2.8.10' );
+define( 'WP_ROCKET_VERSION'             , '2.8.11' );
 define( 'WP_ROCKET_PRIVATE_KEY'         , false );
 define( 'WP_ROCKET_SLUG'                , 'wp_rocket_settings' );
 define( 'WP_ROCKET_WEB_MAIN'            , 'http://support.wp-rocket.me/' );