Merge pull request #50 from humanmade/backport-46-to-v2-branch

Backport #46 to v2-branch: Check tachyon is enabled before loading smart media
humanmade · Nov 18, 2019 · 8c0f86e · 8c0f86e
2 parents 10b0b0f + a2510e0
commit 8c0f86e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/inc/namespace.php b/inc/namespace.php
@@ -30,7 +30,8 @@ function load_plugins() {
 		require_once $vendor_dir . '/humanmade/tachyon-plugin/tachyon.php';
 	}
 
-	if ( $config['smart-media'] ) {
+	// Smart Media requires Tachyon to work.
+	if ( $config['tachyon'] && $config['smart-media'] ) {
 		require_once $vendor_dir . '/humanmade/smart-media/plugin.php';
 		remove_filter( 'intermediate_image_sizes_advanced', 'HM\\Media\\Cropper\\prevent_thumbnail_generation' );
 	}