remove default and required for folder

Author: DavidCramer

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php

@@ -509,7 +509,7 @@ public function apply_default_transformations( array $transformations, $type = '
 					$default['quality'] = 'auto';
 				}
 			}
-			$default = array_filter( $default ); // Clear out empty settings.
+			$default                   = array_filter( $default ); // Clear out empty settings.
 			$new_transformations['qf'] = \Cloudinary\Connect\Api::generate_transformation_string( array( $default ), $type );
 			// Add freeform global transformations.
 			$freeform_type = $type . '_freeform';
@@ -892,7 +892,6 @@ public function editor_assets() {
 				'api_key'       => $this->credentials['api_key'],
 				'cms_type'      => 'wordpress',
 				'remove_header' => true,
-				'folder'        => array( 'path' => $this->cloudinary_folder ),
 				'integration'   => array(
 					'type'     => 'wordpress_plugin',
 					'platform' => 'WordPress ' . get_bloginfo( 'version' ),
@@ -901,6 +900,11 @@ public function editor_assets() {
 			),
 		);
 
+		// Set folder if needed.
+		if ( !empty( $this->cloudinary_folder ) ) {
+			$params['mloptions']['folder'] = array( 'path' => $this->cloudinary_folder );
+		}
+
 		$params['mloptions']['insert_transformation'] = true;
 		$params['mloptions']['inline_container']      = '#cloudinary-dam';
 

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-sync-media.php

@@ -15,10 +15,8 @@
 	'fields'          => array(
 		'cloudinary_folder' => array(
 			'label'             => __( 'Cloudinary folder path', 'cloudinary' ),
-			'description'       => __( 'Specify the folder in your Cloudinary account where WordPress assets are uploaded to. All assets uploaded to WordPress from this point on will be synced to the specified folder in Cloudinary.', 'cloudinary' ),
-			'default'           => '/',
+			'description'       => __( 'Specify the folder in your Cloudinary account where WordPress assets are uploaded to. All assets uploaded to WordPress from this point on will be synced to the specified folder in Cloudinary. Leave blank to use the root of your Cloudinary library.', 'cloudinary' ),
 			'sanitize_callback' => array( '\Cloudinary\Media', 'sanitize_cloudinary_folder' ),
-			'required'          => true,
 			'suffix'            => '<button type="submit" class="button button-primary">' . __( 'Save folder settings', 'cloudinary' ) . '</button>',
 		),
 	),