From 5f88504dc2db1d6c32e6b369a6d7fd94b785db56 Mon Sep 17 00:00:00 2001 From: David Cramer Date: Thu, 13 Feb 2020 20:33:57 +0200 Subject: [PATCH] default root folder --- .../php/sync/class-push-sync.php | 6 +++++- .../ui-definitions/tabs/settings-sync-media.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php index d79df2877..9c54f27dc 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php @@ -350,9 +350,13 @@ public function prepare_upload( $post ) { $public_id = $post->{Sync::META_KEYS['public_id']}; // use the __get method on the \WP_Post to get post_meta. $dirs = wp_get_upload_dir(); $cld_folder = false; + $folder = trailingslashit( $dirs['cloudinary_folder'] ); + if ( '/' === $dirs['cloudinary_folder'] ) { + $folder = ''; + } if ( empty( $public_id ) ) { $file_info = pathinfo( $file ); - $public_id = trailingslashit( $dirs['cloudinary_folder'] ) . $file_info['filename']; + $public_id = $folder . $file_info['filename']; } // Check if cloudinary folder is in public_id. diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-sync-media.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-sync-media.php index bf6b2deb6..8e77d53eb 100644 --- a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-sync-media.php +++ b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-sync-media.php @@ -16,7 +16,7 @@ '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' => trim( $base['host'], '/' ), + 'default' => '/', 'sanitize_callback' => array( '\Cloudinary\Media', 'sanitize_cloudinary_folder' ), 'required' => true, 'suffix' => '',