From 1536779aafa5ef0aa207aa49badeeaa163ee23a6 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 11 Sep 2013 04:49:10 +0000 Subject: [PATCH] Avoid error in ms-files.php after [25317]. Built from https://develop.svn.wordpress.org/trunk@25344 git-svn-id: http://core.svn.wordpress.org/trunk@25306 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 2cab41acd7..2390adca33 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2043,8 +2043,10 @@ function get_allowed_mime_types( $user = null ) { $t = wp_get_mime_types(); unset( $t['swf'], $t['exe'] ); - $unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' ); - if ( ! $unfiltered ) + if ( function_exists( 'current_user_can' ) ) + $unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' ); + + if ( empty( $unfiltered ) ) unset( $t['htm|html'] ); return apply_filters( 'upload_mimes', $t, $user );