Merge branch 'develop' into add/original-image-storage

Author: pereirinha

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.css

@@ -39,7 +39,6 @@
 				}
 
 				&-type {
-					width: 45%;
 					display: inline-block;
 					margin-right: 8px;
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.34cb260ad722325c597cdc3a3e7584d8.woff

@@ -75,7 +75,7 @@ const TransformationsToggle = ( props ) => {
 	return (
 		<PanelBody title={__( 'Transformations', 'cloudinary' )}>
 			<ToggleControl
-				label={__( 'Overwrite Transformations', 'cloudinary' )}
+				label={__( 'Overwrite Global Transformations', 'cloudinary' )}
 				checked={overwrite_transformations}
 				onChange={( value ) => {
 					setAttributes( {overwrite_transformations: value} );

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.7e6e75b25255a2b3b6e7ced1092c210c.eot

@@ -262,7 +262,7 @@ public function get_signature( $attachment_id, $cached = true ) {
 		if ( ! empty( $signatures[ $attachment_id ] ) && true === $cached ) {
 			$return = $signatures[ $attachment_id ];
 		} else {
-			$signature = $this->managers['media']->get_post_meta( $attachment_id, self::META_KEYS['signature'], true );
+			$signature = (array) $this->managers['media']->get_post_meta( $attachment_id, self::META_KEYS['signature'], true );
 			if ( empty( $signature ) ) {
 				$signature = array();
 			}
@@ -758,6 +758,10 @@ public function set_signature_item( $attachment_id, $type, $value = null ) {
 			// Generate a new value based on generator.
 			$value = $this->generate_type_signature( $type, $attachment_id );
 		}
+		// Ensure we have an array.
+		if ( empty( $meta[ Sync::META_KEYS['cloudinary'] ][ Sync::META_KEYS['signature'] ] ) || ! is_array( $meta[ Sync::META_KEYS['cloudinary'] ][ Sync::META_KEYS['signature'] ] ) ) {
+			$meta[ Sync::META_KEYS['cloudinary'] ][ Sync::META_KEYS['signature'] ] = array();
+		}
 		$meta[ Sync::META_KEYS['cloudinary'] ][ Sync::META_KEYS['signature'] ][ $type ] = $value;
 		wp_update_attachment_metadata( $attachment_id, $meta );
 	}

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.c2afda9d25532c03cd41beb20a1ce439.ttf

@@ -228,6 +228,7 @@ function ( $item ) use ( $transformation_index ) {
 	 * @param string|null $public_id The Public ID to get a url for.
 	 * @param array       $args      Additional args.
 	 * @param array       $size      The WP Size array.
+	 * @param bool        $clean     Flag to produce a non variable size url.
 	 *
 	 * @return string
 	 */
@@ -398,10 +399,11 @@ public function upload_large( $attachment_id, $args ) {
 	 * @param int   $attachment_id Attachment ID to upload.
 	 * @param array $args          Array of upload options.
 	 * @param array $headers       Additional headers to use in upload.
+	 * @param bool  $try_remote    Flag to try_remote upload.
 	 *
 	 * @return array|\WP_Error
 	 */
-	public function upload( $attachment_id, $args, $headers = array() ) {
+	public function upload( $attachment_id, $args, $headers = array(), $try_remote = true ) {
 
 		$resource            = ! empty( $args['resource_type'] ) ? $args['resource_type'] : 'image';
 		$resource            = $this->convert_resource_type( $resource );
@@ -416,7 +418,7 @@ public function upload( $attachment_id, $args, $headers = array() ) {
 			$disable_https_fetch = false;
 		}
 		// Check if we can try http file upload.
-		if ( empty( $headers ) && empty( $disable_https_fetch ) ) {
+		if ( empty( $headers ) && empty( $disable_https_fetch ) && true === $try_remote ) {
 			$args['file'] = $file_url;
 		} else {
 			// We should have the file in args at this point, but if the transient was set, it will be defaulting here.