Merge pull request #1088 from cloudinary/fix-svg-pulling

Avoid SVG conversion for pulled SVG from Cloudinary if SVG support is enabled

Author: aatanasov-cloudinary

php/class-svg.php

@@ -217,6 +217,22 @@ public function is_active() {
 		return 'on' === $this->config[ $this->enable_slug ];
 	}
 
+	/**
+	 * Disable SVG conversion.
+	 * If SVG support is active, we don't want to convert SVGs to other formats.
+	 *
+	 * @param array $base_types The base types for conversion.
+	 *
+	 * @return array
+	 */
+	public function disable_svg_conversion( $base_types ) {
+		if ( $this->is_active() && ! empty( $base_types['svg'] ) ) {
+			unset( $base_types['svg'] );
+		}
+
+		return $base_types;
+	}
+
 	/**
 	 * Setup the component
 	 */
@@ -233,6 +249,7 @@ public function setup_hooks() {
 		add_filter( 'cloudinary_allowed_extensions', array( $this, 'allow_svg_for_cloudinary' ) );
 		add_filter( 'cloudinary_upload_options', array( $this, 'remove_svg_eagers' ), 10, 2 );
 		add_filter( 'cloudinary_upload_args', array( $this, 'upload_args' ), 10, 2 );
+		add_filter( 'cloudinary_convert_media_types', array( $this, 'disable_svg_conversion' ) );
 
 		// Add actions.
 		add_action( 'cloudinary_uploaded_asset', array( $this, 'maybe_setup_metadata' ), 10, 2 );