Changeset 25345 for branches/3.6/wp-includes/functions.php

Timestamp:

09/11/2013 04:49:47 AM (12 years ago)

Author:

nacin

Message:

Avoid error in ms-files.php after [25317] (merged as [25322]). Merges [25344] to 3.6.

File:

• branches/3.6/wp-includes/functions.php (modified) (1 diff)

branches/3.6/wp-includes/functions.php

@@ -2033 +2033 @@
 
     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'] );