autonomic-cooperative/divi
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgarded to 4.17.4

Browse Source
This commit is contained in:
naomi
2022-06-23 13:17:18 +01:00
parent 80f1e87db9
commit a04fb0c7af
404 changed files with 54683 additions and 4417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/builder/plugin-compat/amazon-s3-and-cloudfront.php
View File

@ -67,14 +67,24 @@ class ET_Builder_Plugin_Compat_WP_Offload_S3 extends ET_Builder_Plugin_Compat_Ba
global $as3cf;
$as3cf_s3_to_local = new AS3CF_S3_To_Local( $as3cf );
$attachment_id = $attachment_id_pre;
$attachment_id = $as3cf_s3_to_local->get_attachment_id_from_url( $url );
// In WP Offload Media 2.6 the get_attachment_id_from_url() method was renamed to get_item_source_from_url().
// Now the method also returns bool or array. If it's an array we need to process it.
if ( method_exists( $as3cf_s3_to_local, 'get_item_source_from_url' ) ) {
$item_source = $as3cf_s3_to_local->get_item_source_from_url( $url );
if ( $attachment_id ) {
return $attachment_id;
if ( is_array( $item_source ) && array_key_exists( 'id', $item_source ) ) {
$attachment_id = $item_source['id'];
}
}
return $attachment_id_pre;
// Pre 2.6. get_attachment_id_from_url() will return the attachment ID.
if ( method_exists( $as3cf_s3_to_local, 'get_attachment_id_from_url' ) ) {
$attachment_id = $as3cf_s3_to_local->get_attachment_id_from_url( $url );
}
return $attachment_id;
}
/**