Changeset 29718

Timestamp:

09/07/2014 10:10:33 AM (11 years ago)

Author:

SergeyBiryukov

Message:

• Declare $site_mimes before using it in check_upload_mimes().
• Use the same default value for 'upload_filetypes' as on Network Settings screen.

props rmccue.
fixes #29512 for trunk.

Location:

trunk/src

Files:

• wp-admin/network/settings.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-admin/network/settings.php

@@ -265 +265 @@
             <tr>
                 <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
-                <td><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option('upload_filetypes', 'jpg jpeg png gif') ) ?>" size="45" /></td>
+                <td><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" /></td>
             </tr>
 

trunk/src/wp-includes/ms-functions.php

@@ -1746 +1746 @@
  */
 function check_upload_mimes( $mimes ) {
-    $site_exts = explode( ' ', get_site_option( 'upload_filetypes' ) );
+    $site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+    $site_mimes = array();
     foreach ( $site_exts as $ext ) {
         foreach ( $mimes as $ext_pattern => $mime ) {