Skip to content

Fix/separate meta #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 30, 2021
Merged

Fix/separate meta #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd02105
Cleanup
Jun 30, 2021
f1d5612
Improve output consistency
Jun 30, 2021
c714cb0
Default get meta to null
Jun 30, 2021
9f59afc
Get single key for delivery type
Jun 30, 2021
23ab2c0
Change the source of information into the newly added Cloudinary meta…
Jun 30, 2021
fca6001
Use plugin internal logic to check if the media is local
Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions php/class-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ public function default_image_freeform_transformations( $default ) {
* @return string The converted URL.
*/
public function cloudinary_url( $attachment_id, $size = array(), $transformations = array(), $cloudinary_id = null, $overwrite_transformations = false ) {
if ( ! ( $cloudinary_id ) ) {
if ( ! $cloudinary_id ) {
$cloudinary_id = $this->cloudinary_id( $attachment_id );
if ( ! $cloudinary_id ) {
return null;
Expand Down Expand Up @@ -1159,7 +1159,7 @@ public function get_cloudinary_id( $attachment_id ) {
*
* @param int $attachment_id The ID to get Cloudinary id for.
*
* @return string|false the ID or null if not existing.
* @return string|false the ID or false if not existing.
*/
public function cloudinary_id( $attachment_id ) {
static $cloudinary_ids = array();
Expand All @@ -1170,8 +1170,8 @@ public function cloudinary_id( $attachment_id ) {
}

if ( ! $this->is_media( $attachment_id ) ) {
$cloudinary_ids[ $attachment_id ] = null;
return null;
$cloudinary_ids[ $attachment_id ] = false;
return false;
}

if ( ! $this->sync->is_synced( $attachment_id ) && ! defined( 'REST_REQUEST' ) ) {
Expand Down Expand Up @@ -1857,7 +1857,7 @@ public function get_post_meta( $post_id, $key = '', $single = false ) {
}
}
if ( '' !== $key ) {
$meta = isset( $meta[ $key ] ) ? $meta[ $key ] : '';
$meta = isset( $meta[ $key ] ) ? $meta[ $key ] : null;
}

return $single ? $meta : (array) $meta;
Expand Down
3 changes: 2 additions & 1 deletion php/class-report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ public function image_meta_viewer() {
*/
public function render( $post ) {
if ( 'attachment' === $post->post_type ) {
$meta = wp_get_attachment_metadata( $post->ID );
$sync = $this->plugin->get_component( 'sync' );
$meta = get_post_meta( $post->ID, $sync::META_KEYS['cloudinary'], true );

$args = array(
'type' => 'tag',
Expand Down
2 changes: 1 addition & 1 deletion php/class-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ public function setup_sync_base_struct() {
'priority' => 25,
'sync' => array( $this->managers['upload'], 'explicit_update' ),
'validate' => function ( $attachment_id ) {
$delivery = $this->managers['media']->get_post_meta( $attachment_id, self::META_KEYS['delivery'] );
$delivery = $this->managers['media']->get_post_meta( $attachment_id, self::META_KEYS['delivery'], true );

return empty( $delivery ) || 'upload' === $delivery;
},
Expand Down
4 changes: 2 additions & 2 deletions php/connect/class-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,13 @@ function_exists( 'wp_get_original_image_url' ) &&
} else {
$file_url = wp_get_attachment_url( $attachment_id );
}
if ( ! is_local_attachment( $attachment_id ) ) {
$media = get_plugin_instance()->get_component( 'media' );
if ( ! $media->is_local_media( $attachment_id ) ) {
$disable_https_fetch = false; // Remote can upload via url.
// translators: variable is thread name and queue size.
$action_message = sprintf( __( 'Uploading remote url: %1$s.', 'cloudinary' ), $file_url );
do_action( '_cloudinary_queue_action', $action_message );
}
$media = get_plugin_instance()->get_component( 'media' );
$tempfile = false;
if ( $media && $media->is_cloudinary_url( $file_url ) ) {
// If this is a Cloudinary URL, then we can use it to fetch from that location.
Expand Down