bring up to date with latest changes in WP Emerge

htmlburger · May 9, 2018 · a1e4694 · a1e4694
1 parent 2af6b18
commit a1e4694
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Image/Image.php b/src/Image/Image.php
@@ -2,7 +2,7 @@
 
 namespace WPEmergeTheme\Image;
 
-use WPEmerge\Helpers\Mixed;
+use WPEmerge\Helpers\MixedType;
 
 class Image {
 	/**
@@ -69,15 +69,15 @@ public function thumbnail( $attachment_id, $width, $height, $crop = true ) {
 
 		$upload_dir = wp_upload_dir();
 		$attachment = wp_get_attachment_metadata( $attachment_id );
-		$source = Mixed::normalizePath( get_attached_file( $attachment_id ) );
+		$source = MixedType::normalizePath( get_attached_file( $attachment_id ) );
 
 		if ( ! $attachment || ! file_exists( $source ) ) {
 			return '';
 		}
 
 		$attachment_subdirectory = preg_replace( '/\/?[^\/]+\z/', '', $attachment['file'] );
 		$filename = $this->getResizedFilename( $source, $width, $height, $crop );
-		$destination = Mixed::normalizePath( Mixed::normalizePath( $upload_dir['basedir'] ) . DIRECTORY_SEPARATOR . $attachment_subdirectory ) . DIRECTORY_SEPARATOR . $filename;
+		$destination = MixedType::normalizePath( MixedType::normalizePath( $upload_dir['basedir'] ) . DIRECTORY_SEPARATOR . $attachment_subdirectory ) . DIRECTORY_SEPARATOR . $filename;
 
 		$stored = $this->store( $source, $destination, $width, $height, $crop );
 

diff --git a/src/Theme/Theme.php b/src/Theme/Theme.php
@@ -4,7 +4,7 @@
 
 use WPEmerge;
 use WPEmerge\Facades\Framework;
-use WPEmerge\Helpers\Mixed;
+use WPEmerge\Helpers\MixedType;
 use WPEmergeTheme\Assets\AssetsServiceProvider;
 use WPEmergeTheme\Avatar\AvatarServiceProvider;
 use WPEmergeTheme\Image\ImageServiceProvider;