Skip to content

Feature/cloud 389 #77

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 3 commits into from
Apr 25, 2020
Merged

Feature/cloud 389 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63224dd
Set default for enabled_breakpoints setting
Apr 24, 2020
9131d93
Confirm that $intermediate is an array
Apr 24, 2020
e4a6f6a
Initialize variable
Apr 24, 2020
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
4 changes: 3 additions & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,9 @@ public function cloudinary_url( $attachment_id, $size = array(), $transformation
// Check size and correct if string or size.
if ( is_string( $size ) || ( is_array( $size ) && 3 === count( $size ) ) ) {
$intermediate = image_get_intermediate_size( $attachment_id, $size );
$size = $this->get_crop( $intermediate['url'], $attachment_id );
if ( is_array( $intermediate ) ) {
$size = $this->get_crop( $intermediate['url'], $attachment_id );
}
}

/**
Expand Down
5 changes: 2 additions & 3 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ public function prepare_upload( $post, $down_sync = false ) {
}

// First check if this has a file and it can be uploaded.
$file = get_attached_file( $post->ID );
$file = get_attached_file( $post->ID );
$file_size = 0;
if ( empty( $file ) ) {
return new \WP_Error( 'attachment_no_file', __( 'Attachment did not have a file.', 'cloudinary' ) );
} elseif ( ! file_exists( $file ) ) {
Expand All @@ -347,8 +348,6 @@ public function prepare_upload( $post, $down_sync = false ) {
}
$file = get_attached_file( $post->ID );
$file_size = filesize( $file );
} else {
$file_size = 0;
}
}
} else {
Expand Down
7 changes: 4 additions & 3 deletions ...and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/settings-global-transformations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
'label' => __( 'Responsive Image Settings', 'cloudinary' ),
),
'enable_breakpoints' => array(
'label' => __( 'Enable Breakpoints', 'cloudinary' ),
'suffix' => __( 'Enable breakpoint generation on upload.', 'cloudinary' ),
'type' => 'checkbox',
'label' => __( 'Enable Breakpoints', 'cloudinary' ),
'suffix' => __( 'Enable breakpoint generation on upload.', 'cloudinary' ),
'type' => 'checkbox',
'default' => 'off',
),
'breakpoints' => array(
'label' => __( 'Max breakpoints', 'cloudinary' ),
Expand Down