Update Aksimet v3.3.1, Jetpack v 4.9, Public Post Preview v 2.6.0

1 files changed, 12 insertions, 9 deletions

diff --git a/plugins/jetpack/class.jetpack.php b/plugins/jetpack/class.jetpack.php
index 4a04c4d3..83fe2412 100644
--- a/plugins/jetpack/class.jetpack.php
+++ b/plugins/jetpack/class.jetpack.php
@@ -56,6 +56,8 @@ class Jetpack {
 		'jetpack_image_widget',
 		'jetpack-my-community-widget',
 		'wordads',
+		'eu-cookie-law-style',
+		'flickr-widget-style',
 	);
 
 	public $plugins_to_deactivate = array(
@@ -114,6 +116,7 @@ class Jetpack {
 			'Contact Form Plugin'                  => 'contact-form-plugin/contact_form.php',
 			'Easy Contact Forms'                   => 'easy-contact-forms/easy-contact-forms.php',
 			'Fast Secure Contact Form'             => 'si-contact-form/si-contact-form.php',
+			'Ninja Forms'                          => 'ninja-forms/ninja-forms.php',
 		),
 		'minileven'         => array(
 			'WPtouch'                              => 'wptouch/wptouch.php',
@@ -2318,9 +2321,9 @@ class Jetpack {
 		// We maintain the data for the current version of Jetpack plus the previous version
 		// to prevent repeated DB hits on large sites hosted with multiple web servers
 		// on a single database (since all web servers might not be updated simultaneously)
-		
+
 		$file_data_option[ JETPACK__VERSION ][ $key ] = $data;
-		
+
 		if ( count( $file_data_option ) > 2 ) {
 			$count = 0;
 			krsort( $file_data_option );
@@ -2331,12 +2334,12 @@ class Jetpack {
 				}
 			}
 		}
-		
+
 		Jetpack_Options::update_option( 'file_data', $file_data_option );
 
 		return $data;
 	}
-	
+
 
 	/**
 	 * Return translated module tag.
@@ -3302,7 +3305,7 @@ p {
 	 * If `$update_media_item` is true and `post_id` is defined
 	 * the attachment file of the media item (gotten through of the post_id)
 	 * will be updated instead of add a new one.
-	 * 
+	 *
 	 * @param  boolean $update_media_item - update media attachment
 	 * @return array - An array describing the uploadind files process
 	 */
@@ -3369,10 +3372,10 @@ p {
 
 				$media_array = $_FILES['media'];
 
-				$file_array['name'] = $media_array['name'][0]; 
-				$file_array['type'] = $media_array['type'][0]; 
-				$file_array['tmp_name'] = $media_array['tmp_name'][0]; 
-				$file_array['error'] = $media_array['error'][0]; 
+				$file_array['name'] = $media_array['name'][0];
+				$file_array['type'] = $media_array['type'][0];
+				$file_array['tmp_name'] = $media_array['tmp_name'][0];
+				$file_array['error'] = $media_array['error'][0];
 				$file_array['size'] = $media_array['size'][0];
 
 				$edited_media_item = Jetpack_Media::edit_media_file( $post_id, $file_array );