Changeset 22463

Timestamp:

11/08/2012 02:02:03 AM (13 years ago)

Author:

nacin

Message:

In WP_Image_Editor / wp_load_image(), use is_file() rather than file_exists() so we do not accidentally load a directory.

props benkulbertis, DH-Shredder, scribu.
fixes #17814.

Location:

trunk/wp-includes

Files:

• class-wp-image-editor-gd.php (modified) (1 diff)
• class-wp-image-editor-imagick.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)

trunk/wp-includes/class-wp-image-editor-gd.php

@@ -52 +52 @@
             return true;
 
-        if ( ! file_exists( $this->file ) )
+        if ( ! is_file( $this->file ) )
             return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 

trunk/wp-includes/class-wp-image-editor-imagick.php

@@ -53 +53 @@
             return true;
 
-        if ( ! file_exists( $this->file ) )
+        if ( ! is_file( $this->file ) )
             return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 

trunk/wp-includes/deprecated.php

@@ -3222 +3222 @@
         $file = get_attached_file( $file );
 
-    if ( ! file_exists( $file ) )
+    if ( ! is_file( $file ) )
         return sprintf(__('File “%s” doesn’t exist?'), $file);