Changeset 9270 for trunk/wp-includes/functions.php

Timestamp:

10/21/2008 11:54:18 PM (18 years ago)

Author:

ryan

Message:

Notice fixes from DD32. see #7509

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -1894 +1894 @@
         // separate the filename into a name and extension
         $info = pathinfo($filename);
-        $ext = $info['extension'];
+        $ext = !empty($info['extension']) ? $info['extension'] : '';
         $name = basename($filename, ".{$ext}");
 
@@ -1907 +1907 @@
                 $number = '';
 
-                if ( empty( $ext ) )
-                        $ext = '';
-                else
+                if ( !empty( $ext ) )
                         $ext = strtolower( ".$ext" );
 
@@ -1952 +1950 @@
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
         if ( empty( $name ) )
-                return array( 'error' => __( "Empty filename" ) );
+                return array( 'error' => __( 'Empty filename' ) );
 
         $wp_filetype = wp_check_filetype( $name );
         if ( !$wp_filetype['ext'] )
-                return array( 'error' => __( "Invalid file type" ) );
+                return array( 'error' => __( 'Invalid file type' ) );
 
         $upload = wp_upload_dir( $time );