* Declare $site_mimes before using it in check_upload_mimes().

SergeyBiryukov · SergeyBiryukov · commit d552ba29bca6 · 2014-09-07T10:10:33.000Z
* Use the same default value for 'upload_filetypes' as on Network Settings screen. props rmccue. fixes #29512 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@29718 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
@@ -264,7 +264,7 @@
 
 			<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>
 
 			<tr>
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
@@ -1745,7 +1745,8 @@ function recurse_dirsize( $directory ) {
  * @return array
  */
 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 ) {
 			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
