Skip to content

Add breakpoint flag to convert_url() #73

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

Add breakpoint flag to convert_url() #73

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a19b48a
Add breakpoint flag to convert_url()
Apr 23, 2020
2d3bb27
Allow initial/primary URL to be changed on request.
DavidCramer Apr 24, 2020
2fc172d
correctly name to
DavidCramer Apr 24, 2020
3d5fc9f
Bypass updating the attachment URL on admin
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
34 changes: 19 additions & 15 deletions 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 @@ -463,7 +463,7 @@ public function get_transformations_from_string( $str, $type = 'image' ) {
* @return string Cloudinary URL.
*/
public function attachment_url( $url, $attachment_id ) {
if ( ! doing_action( 'wp_insert_post_data' ) && wp_attachment_is( 'video', $attachment_id ) ) {
if ( ! doing_action( 'wp_insert_post_data' ) && ! is_admin() ) {
$cloudinary_id = $this->cloudinary_id( $attachment_id );
if ( false !== $cloudinary_id ) {
$url = $this->cloudinary_url( $attachment_id, $cloudinary_id );
Expand Down Expand Up @@ -542,16 +542,16 @@ public function apply_default_transformations( array $transformations, $type = '
/**
* Generate a Cloudinary URL based on attachment ID and required size.
*
* @param int $attachment_id The id of the attachment.
* @param array|string $size The wp size to set for the URL.
* @param array $transformations Set of transformations to apply to this url.
* @param string $cloudinary_id Optional forced cloudinary ID.
* @param bool $breakpoint Flag url is a breakpoint URL to stop re-applying default transformations.
* @param bool $clean Flag to present a clean url (With out a WP size variable.
* @param int $attachment_id The id of the attachment.
* @param array|string $size The wp size to set for the URL.
* @param array $transformations Set of transformations to apply to this url.
* @param string $cloudinary_id Optional forced cloudinary ID.
* @param bool $overwrite_transformations Flag url is a breakpoint URL to stop re-applying default transformations.
* @param bool $clean Flag to present a clean url (With out a WP size variable.
*
* @return string The converted URL.
*/
public function cloudinary_url( $attachment_id, $size = array(), $transformations = array(), $cloudinary_id = null, $breakpoint = false, $clean = false ) {
public function cloudinary_url( $attachment_id, $size = array(), $transformations = array(), $cloudinary_id = null, $overwrite_transformations = false, $clean = false ) {

if ( empty( $cloudinary_id ) ) {
$cloudinary_id = $this->cloudinary_id( $attachment_id );
Expand Down Expand Up @@ -587,7 +587,7 @@ public function cloudinary_url( $attachment_id, $size = array(), $transformation
*/
$pre_args['transformation'] = apply_filters( 'cloudinary_transformations', $transformations, $attachment_id );
// Defaults are only to be added on front, main images ( not breakpoints, since these are adapted down), and videos.
if ( ( ! defined( 'REST_REQUEST' ) || false === REST_REQUEST ) && ! is_admin() && false === $breakpoint ) {
if ( ( ! defined( 'REST_REQUEST' ) || false === REST_REQUEST ) && ! is_admin() && false === $overwrite_transformations ) {
$pre_args['transformation'] = $this->apply_default_transformations( $pre_args['transformation'], $resource_type );
}

Expand Down Expand Up @@ -732,17 +732,21 @@ public function filter_downsize( $image, $attachment_id, $size ) {
/**
* Convert an attachment URL to a Cloudinary one.
*
* @param string $url Url to convert.
* @param int $attachment_id Attachment ID.
* @param array $transformations Optional transformations.
* @param string $url Url to convert.
* @param int $attachment_id Attachment ID.
* @param array $transformations Optional transformations.
* @param bool $overwrite_transformations Flag url as having an overwrite transformation.
*
* @return string Converted URL.
*/
public function convert_url( $url, $attachment_id, $transformations = array() ) {
public function convert_url( $url, $attachment_id, $transformations = array(), $overwrite_transformations = true ) {

if ( $this->is_cloudinary_url( $url ) ) {
return $url; // Already is a cloudinary URL, just return.
}
$size = $this->get_crop( $url, $attachment_id );

return $this->cloudinary_url( $attachment_id, $size, $transformations, null, true );
return $this->cloudinary_url( $attachment_id, $size, $transformations, null, $overwrite_transformations, true );
}

/**
Expand Down Expand Up @@ -820,7 +824,7 @@ function ( $item ) use ( $crop ) {
// Use current sources, but convert the URLS.
foreach ( $sources as &$source ) {
if ( ! $this->is_cloudinary_url( $source['url'] ) ) {
$source['url'] = $this->convert_url( $source['url'], $attachment_id, $transformations );
$source['url'] = $this->convert_url( $source['url'], $attachment_id, $transformations, true ); // Overwrite transformations applied, since the $transformations includes globals from the primary URL.
}
}

Expand Down