Merge pull request #307 from jeherve/fix/photon-images-jetpack-compatibility
Compatibility: do not serve images with Jetpack CDN when active
This commit is contained in:
commit
475f4aaea0
1 changed files with 25 additions and 0 deletions
|
@ -306,7 +306,32 @@ class Post {
|
||||||
// get URLs for each image
|
// get URLs for each image
|
||||||
foreach ( $image_ids as $id ) {
|
foreach ( $image_ids as $id ) {
|
||||||
$alt = \get_post_meta( $id, '_wp_attachment_image_alt', true );
|
$alt = \get_post_meta( $id, '_wp_attachment_image_alt', true );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If you use the Jetpack plugin and its Image CDN, aka Photon,
|
||||||
|
* the image strings returned will use the Photon URL.
|
||||||
|
* We don't want that since Fediverse instances already do caching on their end.
|
||||||
|
* Let the CDN only be used for visitors of the site.
|
||||||
|
*
|
||||||
|
* Old versions of Jetpack used the Jetpack_Photon class to do this.
|
||||||
|
* New versions use the Image_CDN class.
|
||||||
|
* Let's handle both.
|
||||||
|
*/
|
||||||
|
if ( \class_exists( '\Automattic\Jetpack\Image_CDN\Image_CDN' ) ) {
|
||||||
|
\remove_filter( 'image_downsize', array( \Automattic\Jetpack\Image_CDN\Image_CDN::instance(), 'filter_image_downsize' ) );
|
||||||
|
} elseif ( \class_exists( 'Jetpack_Photon' ) ) {
|
||||||
|
\remove_filter( 'image_downsize', array( \Jetpack_Photon::instance(), 'filter_image_downsize' ) );
|
||||||
|
}
|
||||||
|
|
||||||
$thumbnail = \wp_get_attachment_image_src( $id, 'full' );
|
$thumbnail = \wp_get_attachment_image_src( $id, 'full' );
|
||||||
|
|
||||||
|
// Re-enable Photon now that the image URL has been built.
|
||||||
|
if ( \class_exists( '\Automattic\Jetpack\Image_CDN\Image_CDN' ) ) {
|
||||||
|
\add_filter( 'image_downsize', array( \Automattic\Jetpack\Image_CDN\Image_CDN::instance(), 'filter_image_downsize' ), 10, 3 );
|
||||||
|
} elseif ( \class_exists( 'Jetpack_Photon' ) ) {
|
||||||
|
\add_filter( 'image_downsize', array( \Jetpack_Photon::instance(), 'filter_image_downsize' ), 10, 3 );
|
||||||
|
}
|
||||||
|
|
||||||
$mimetype = \get_post_mime_type( $id );
|
$mimetype = \get_post_mime_type( $id );
|
||||||
|
|
||||||
if ( $thumbnail ) {
|
if ( $thumbnail ) {
|
||||||
|
|
Loading…
Reference in a new issue