Handle more edge cases

Author: gabriel-detassigny

php/integrations/class-elementor.php

@@ -16,6 +16,38 @@
  */
 class Elementor extends Integrations {
 
+	/**
+	 * List of Elementor background image settings keys, along with their device and CSS suffix.
+	 *
+	 * @var array
+	 */
+	const ELEMENTOR_BACKGROUND_IMAGES = array(
+		'_background_image'              => array(
+			'device' => 'desktop',
+			'suffix' => '',
+		),
+		'_background_hover_image'        => array(
+			'device' => 'desktop',
+			'suffix' => ':hover',
+		),
+		'_background_image_tablet'       => array(
+			'device' => 'tablet',
+			'suffix' => '',
+		),
+		'_background_hover_image_tablet' => array(
+			'device' => 'tablet',
+			'suffix' => ':hover',
+		),
+		'_background_image_mobile'       => array(
+			'device' => 'mobile',
+			'suffix' => '',
+		),
+		'_background_hover_image_mobile' => array(
+			'device' => 'mobile',
+			'suffix' => ':hover',
+		),
+	);
+
 	/**
 	 * Check if the integration can be enabled.
 	 *
@@ -42,38 +74,16 @@ public function register_hooks() {
 	 * @return void
 	 */
 	public function replace_bg_images_in_css( $post_css, $element ) {
-		$media       = $this->plugin->get_component( 'media' );
-		$settings    = $element->get_settings_for_display();
+		$settings = $element->get_settings_for_display();
+		$media    = $this->plugin->get_component( 'media' );
+		$delivery = $this->plugin->get_component( 'delivery' );
 
-		// Define all background image related keys and their specificities.
-		$background_keys = array(
-			'_background_image'              => array(
-				'device' => 'desktop',
-				'suffix' => '',
-			),
-			'_background_hover_image'        => array(
-				'device' => 'desktop',
-				'suffix' => ':hover',
-			),
-			'_background_image_tablet'       => array(
-				'device' => 'tablet',
-				'suffix' => '',
-			),
-			'_background_hover_image_tablet' => array(
-				'device' => 'tablet',
-				'suffix' => ':hover',
-			),
-			'_background_image_mobile'       => array(
-				'device' => 'mobile',
-				'suffix' => '',
-			),
-			'_background_hover_image_mobile' => array(
-				'device' => 'mobile',
-				'suffix' => ':hover',
-			),
-		);
+		if ( ! $media || ! $delivery ) {
+			return;
+		}
 
-		foreach ( $background_keys as $background_key => $background_data ) {
+		foreach ( self::ELEMENTOR_BACKGROUND_IMAGES as $background_key => $background_data ) {
+			// We need to have both URL and ID from the image to proceed.
 			if ( ! isset( $settings[ $background_key ]['url'], $settings[ $background_key ]['id'] ) ) {
 				continue;
 			}
@@ -82,13 +92,16 @@ public function replace_bg_images_in_css( $post_css, $element ) {
 			$media_id     = $settings[ $background_key ]['id'];
 			$media_size   = isset( $settings[ $background_key ]['size'] ) ? $settings[ $background_key ]['size'] : array();
 
-			$cloudinary_url = $media->cloudinary_url( $media_id, $media_size );
-
-			// Skip if the URL is unchanged or the cloudinary URL cannot be generated somehow.
-			if ( ! $cloudinary_url || $cloudinary_url === $original_url ) {
+			// Skip if the media is not deliverable via Cloudinary.
+			if ( ! $delivery->is_deliverable( $media_id ) ) {
 				continue;
 			}
 
+			// If the original URL is already a Cloudinary URL, use it directly; otherwise, generate the Cloudinary URL.
+			$cloudinary_url = $media->is_cloudinary_url( $original_url )
+				? $original_url
+				: $media->cloudinary_url( $media_id, $media_size );
+
 			// Build the CSS selector and rule.
 			$css_selector = $post_css->get_element_unique_selector( $element ) . $background_data['suffix'];
 			$css_rule     = array( 'background-image' => "url('$cloudinary_url')" );