From 0e284575364513e5051bef47c4cc6912beaefc94 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 7 Sep 2014 10:11:17 +0000 Subject: [PATCH] * 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. Built from https://develop.svn.wordpress.org/trunk@29718 git-svn-id: http://core.svn.wordpress.org/trunk@29492 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network/settings.php | 2 +- wp-includes/ms-functions.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index 6349e8cdd0..1736511181 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -264,7 +264,7 @@ if ( isset( $_GET['updated'] ) ) { - + diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 6d7a2fbd52..3fc6646834 100644 --- a/wp-includes/ms-functions.php +++ b/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 )