Merge pull request #736 from cloudinary/fix/breakpoints-in-admin

active and enabled

Author: pereirinha

php/class-delivery-feature.php

@@ -166,7 +166,7 @@ public function enqueue_assets() {
 	 * @return bool
 	 */
 	public function is_enabled() {
-		return 'on' === $this->config[ $this->enable_slug ];
+		return $this->is_active() && 'on' === $this->config[ $this->enable_slug ];
 	}
 
 	/**

php/class-delivery.php

@@ -890,9 +890,11 @@ public function convert_tags( $content, $context = 'view' ) {
 			if ( empty( $relation['public_id'] || $url === $relation['public_id'] ) ) {
 				continue; // We don't need the public_id relation item.
 			}
-			$base             = $type . ':' . $url;
-			$public_id        = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
-			$aliases[ $base ] = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );
+			$base                   = $type . ':' . $url;
+			$public_id              = ! is_admin() ? $relation['public_id'] . '.' . $relation['format'] : null;
+			$cloudinary_url         = $this->media->cloudinary_url( $relation['post_id'], array(), $relation['transformations'], $public_id );
+			$aliases[ $base . '?' ] = $cloudinary_url . '&';
+			$aliases[ $base ]       = $cloudinary_url;
 		}
 
 		// Create the sized found relations second.
@@ -909,7 +911,9 @@ public function convert_tags( $content, $context = 'view' ) {
 					$aliases[ $local_url ] = $cached[ $local_url ];
 					continue;
 				}
-				$aliases[ $local_url ] = $this->media->cloudinary_url( $relation['post_id'], explode( 'x', $size ), $relation['transformations'], $public_id );
+				$cloudinary_url              = $this->media->cloudinary_url( $relation['post_id'], explode( 'x', $size ), $relation['transformations'], $public_id );
+				$aliases[ $local_url . '?' ] = $cloudinary_url . '&';
+				$aliases[ $local_url ]       = $cloudinary_url;
 			}
 		}
 

php/class-svg.php

@@ -207,6 +207,16 @@ public function maybe_setup_metadata( $attachment_id, $result ) {
 		}
 	}
 
+	/**
+	 * Check if component is active.
+	 *
+	 * @return bool
+	 */
+	public function is_active() {
+		// It's always active if on.
+		return 'on' === $this->config[ $this->enable_slug ];
+	}
+
 	/**
 	 * Setup the component
 	 */