From a1e4694461d75bd4b059f9fb270fa03c54679cf0 Mon Sep 17 00:00:00 2001 From: atanas-angelov-dev Date: Wed, 9 May 2018 12:07:47 +0300 Subject: [PATCH] bring up to date with latest changes in WP Emerge --- src/Image/Image.php | 6 +++--- src/Theme/Theme.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Image/Image.php b/src/Image/Image.php index b9e2644..30796db 100644 --- 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,7 +69,7 @@ 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 ''; @@ -77,7 +77,7 @@ public function thumbnail( $attachment_id, $width, $height, $crop = true ) { $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 index e831bea..55ce8f1 100644 --- 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;