diff --git a/classes/Tools/ToolsManager.php b/classes/Tools/ToolsManager.php index 51c2df5b..8d8b32b0 100755 --- a/classes/Tools/ToolsManager.php +++ b/classes/Tools/ToolsManager.php @@ -16,12 +16,14 @@ use MediaCloud\Plugin\Tools\Network\NetworkTool ; use MediaCloud\Plugin\Utilities\Environment ; use MediaCloud\Plugin\Utilities\LicensingManager ; +use MediaCloud\Plugin\Utilities\Logging\Logger ; use MediaCloud\Plugin\Utilities\NoticeManager ; use MediaCloud\Plugin\Utilities\Tracker ; use MediaCloud\Plugin\Utilities\View ; use function MediaCloud\Plugin\Utilities\arrayPath ; use function MediaCloud\Plugin\Utilities\json_response ; use MediaCloud\Plugin\Wizard\SetupWizard ; +use function MediaCloud\Plugin\Utilities\vomit ; if ( !defined( 'ABSPATH' ) ) { header( 'Location: /' ); @@ -66,7 +68,6 @@ final class ToolsManager //region Constructor public function __construct() { - // MigrationsManager::instance()->migrate(); $this->tools = []; if ( class_exists( '\\hyperdb' ) || class_exists( '\\LudicrousDB' ) ) { add_filter( @@ -75,17 +76,9 @@ function ( $value, $option, $old_value ) { if ( empty($value) && strpos( $option, 'mcloud' ) === 0 ) { $type = strtolower( gettype( $value ) ); - if ( in_array( $type, [ 'boolean', 'null' ] ) ) { - Logger::info( - "pre_update_option: Empty {$option} => " . $type, - [], - __METHOD__, - __LINE__ - ); return (string) '0'; } - } return $value; diff --git a/classes/Utilities/Helpers.php b/classes/Utilities/Helpers.php index e6da85db..f4a76c9d 100755 --- a/classes/Utilities/Helpers.php +++ b/classes/Utilities/Helpers.php @@ -17,6 +17,10 @@ if (!defined('ABSPATH') && empty($GLOBALS['__composer_autoload_files'])) { header('Location: /'); die; } + if (function_exists('\MediaCloud\Plugin\Utilities\vomit')) { + return; + } + /** * Brute force debug tool * @param $what diff --git a/ilab-media-tools.php b/ilab-media-tools.php index 8ec0f0a3..7c0e62ee 100755 --- a/ilab-media-tools.php +++ b/ilab-media-tools.php @@ -5,7 +5,7 @@ Plugin URI: https://github.com/interfacelab/ilab-media-tools Description: Automatically upload media to Amazon S3 and integrate with Imgix, a real-time image processing CDN. Boosts site performance and simplifies workflows. Author: interfacelab -Version: 4.2.2 +Version: 4.2.3 Author URI: http://interfacelab.io */ // Copyright (c) 2016 Interfacelab LLC. All rights reserved. @@ -94,7 +94,7 @@ } // Version Defines -define( 'MEDIA_CLOUD_VERSION', '4.2.2' ); +define( 'MEDIA_CLOUD_VERSION', '4.2.3' ); define( 'MEDIA_CLOUD_INFO_VERSION', '4.0.2' ); define( 'MCLOUD_IS_BETA', false ); // Directory defines diff --git a/readme.txt b/readme.txt index ed2ec5b4..03eac7d9 100755 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Requires at least: 4.9 Tested up to: 5.6.1 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html -Stable tag: 4.2.2 +Stable tag: 4.2.3 Requires PHP: 7.1 Automatically store media on Amazon S3, Google Cloud Storage, DigitalOcean Spaces + others. Serve CSS/JS assets through CDNs. Integrate with Imgix. @@ -105,8 +105,10 @@ Imgix is a content delivery network with a twist. In addition to distributing y == Changelog == -= 4.2.2 = += 4.2.3 = +* Fix redeclared function error when using as a composer dependency +* Fix for bug introduced 4.2.2 * Fix for PHP 7.4 type errors * Fix for incorrect imgix URL generation * Massive overhaul of Elementor integration. Media Cloud now will support any Elementor addon and running the