hotfix for media

Author: iruzevic

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [8.0.4]
+
+### Fixed
+- broken media upload after adding svg filters.
+- wrong optimization service class namespace.
+
 ## [8.0.3]
 
 ### Added
@@ -565,6 +571,7 @@ Init setup
 
 [Unreleased]: https://github.com/infinum/eightshift-libs/compare/main...HEAD
 
+[8.0.4]: https://github.com/infinum/eightshift-libs/compare/8.0.3...8.0.4
 [8.0.3]: https://github.com/infinum/eightshift-libs/compare/8.0.2...8.0.3
 [8.0.2]: https://github.com/infinum/eightshift-libs/compare/8.0.1...8.0.2
 [8.0.1]: https://github.com/infinum/eightshift-libs/compare/8.0.0...8.0.1

src/Cli/Cli.php

@@ -66,7 +66,7 @@
 use EightshiftLibs\Media\RegenerateWebPMediaCli;
 use EightshiftLibs\Media\UseWebPMediaCli;
 use EightshiftLibs\Misc\VersionCli;
-use EightshiftLibs\ModifyAdminAppearance\OptimizationCli;
+use EightshiftLibs\Optimization\OptimizationCli;
 use EightshiftLibs\Plugin\PluginCli;
 use EightshiftLibs\Readme\ReadmeCli;
 use EightshiftLibs\Rest\Routes\LoadMore\LoadMoreRouteCli;

src/Media/AbstractMedia.php

@@ -148,23 +148,23 @@ public function enableSvgMediaLibraryPreview($response, $attachment)
 	 */
 	public function validateSvgOnUpload($response)
 	{
-		if ($response['type'] !== 'image/svg+xml' && !\class_exists('SimpleXMLElement')) {
-			return $response;
-		}
-
-		$path = $response['tmp_name'] ?? '';
+		if ($response['type'] === 'image/svg+xml' && \class_exists('SimpleXMLElement')) {
+			$path = $response['tmp_name'];
 
-		$svgContent = \file($path);
-		$svgContent = \implode(' ', $svgContent);
+			$svgContent = \file($path);
+			$svgContent = \implode(' ', $svgContent);
 
-		if (!\file_exists($path) || Helpers::isValidXml($svgContent)) {
-			return $response;
+			if (\file_exists($path)) {
+				if (!Helpers::isValidXml($svgContent)) {
+					return [
+						'size' => $response,
+						'name' => $response['name'],
+					];
+				}
+			}
 		}
 
-		return [
-			'size' => $response,
-			'name' => $response['name'],
-		];
+		return $response;
 	}
 
 	/**

src/Optimization/OptimizationCli.php

@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Class that registers WPCLI command for ModifyAdminAppearance.
+ * Class that registers WPCLI command for Optimization.
  *
- * @package EightshiftLibs\ModifyAdminAppearance
+ * @package EightshiftLibs\Optimization
  */
 
 declare(strict_types=1);
 
-namespace EightshiftLibs\ModifyAdminAppearance;
+namespace EightshiftLibs\Optimization;
 
 use EightshiftLibs\Cli\AbstractCli;
 use EightshiftLibs\Cli\ParentGroups\CliCreate;

src/Optimization/OptimizationExample.php

@@ -57,6 +57,10 @@ public function dequeueStyles(): void
 	 */
 	public function dequeueScripts(): void
 	{
+		if (!\function_exists('is_plugin_active')) {
+			include_once(\ABSPATH . 'wp-admin/includes/plugin.php');
+		}
+
 		// Query monitor expects jquery to work.
 		if (\is_plugin_active('query-monitor/query-monitor.php') && \is_user_logged_in()) {
 			return;