Merge pull request #310 from wp-media/branch-2.9.4

2.9.4
wp-media · Jan 21, 2017 · 6f39ee5 · 6f39ee5
2 parents 4a07c04 + 8d022b9
commit 6f39ee5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/inc/3rd-party/plugins/sf-move-login.php b/inc/3rd-party/plugins/sf-move-login.php
@@ -36,10 +36,11 @@ function rocket_add_sfml_exclude_pages( $urls ) {
 	$sfml_slugs = array_map( 'home_url', $sfml_slugs );
 	$sfml_slugs = array_map( 'trailingslashit', $sfml_slugs );
 	$sfml_slugs = array_map( 'rocket_clean_exclude_file', $sfml_slugs );
-	$sfml_slugs = array_map( function( $sfml_slug ) {
-		return $sfml_slug . '?';
-	}, $sfml_slugs );
-
+
+	foreach( $sfml_slugs as $key => $slug ) {
+		$sfml_slugs[ $key ] = $slug . '?':
+	}
+
 	return array_merge( $urls, $sfml_slugs );
 }
 

diff --git a/inc/admin/admin.php b/inc/admin/admin.php
@@ -273,11 +273,11 @@ function __rocket_rollback() {
 	$plugin_file      	= basename( WP_ROCKET_FILE );
 	$version          	= WP_ROCKET_LASTVERSION;
 	$c_key 				= get_rocket_option( 'consumer_key' );
-	$url 				= sprintf( 'http://support.wp-rocket.me/%s/wp-rocket_%s.zip', $c_key, $version );
+	$url 				= sprintf( 'https://wp-rocket.me/%s/wp-rocket_%s.zip', $c_key, $version );
 	$temp_array 		= array(
 		'slug'        => $plugin_folder,
 		'new_version' => $version,
-		'url'         => 'http://wp-rocket.me',
+		'url'         => 'https://wp-rocket.me',
 		'package'     => $url
 	);
 

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.9.3
+Version: 2.9.4
 Code Name: Iridonia
 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.9.3' );
+define( 'WP_ROCKET_VERSION'             , '2.9.4' );
 define( 'WP_ROCKET_PRIVATE_KEY'         , false );
 define( 'WP_ROCKET_SLUG'                , 'wp_rocket_settings' );
 define( 'WP_ROCKET_WEB_MAIN'            , 'https://wp-rocket.me/' );