From 3cdadeea36bce3d0a2d506964b8740fdcac802cf Mon Sep 17 00:00:00 2001 From: Robin Cornett Date: Wed, 27 Apr 2016 08:18:55 -0400 Subject: [PATCH] Change to core function for file type check --- ...ass-displayfeaturedimagegenesis-helper.php | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/includes/class-displayfeaturedimagegenesis-helper.php b/includes/class-displayfeaturedimagegenesis-helper.php index 0a992c6..a5ed972 100644 --- a/includes/class-displayfeaturedimagegenesis-helper.php +++ b/includes/class-displayfeaturedimagegenesis-helper.php @@ -285,25 +285,23 @@ class Display_Featured_Image_Genesis_Helper { } /** - * returns file extension + * check if file type is image. updated to use WP function. + * @return file check file extension against list * @since 1.2.2 + * @since 2.5.0 */ - protected function get_file_ext( $file ) { - $parsed = @parse_url( $file, PHP_URL_PATH ); - return $parsed ? strtolower( pathinfo( $parsed, PATHINFO_EXTENSION ) ) : false; + protected function is_valid_img_ext( $file ) { + $valid = wp_check_filetype( $file ); + return (bool) in_array( $valid['ext'], $this->allowed_file_types(), true ); } /** - * check if file type is image - * @return file check file extension against list - * @since 1.2.2 + * Define the array of allowed image/file types. + * @return mixed|void array + * @since 2.5.0 */ - protected function is_valid_img_ext( $file ) { - $file_ext = $this->get_file_ext( $file ); - - $is_valid_types = (array) apply_filters( 'displayfeaturedimage_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif' ) ); - - return ( $file_ext && in_array( $file_ext, $is_valid_types, true ) ); + protected function allowed_file_types() { + return apply_filters( 'displayfeaturedimage_valid_img_types', array( 'jpg', 'jpeg', 'png', 'gif' ) ); } /**