WordPress 3.4.1

[autoinstalls/wordpress.git] / wp-includes / capabilities.php

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index d77cfea8e818833b27a5ff060f8927e728d2b581..ca95c2345fd57d26c8ba9f58c74a1bee4a547610 100644 (file)
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1130,6 +1130,8 @@ function map_meta_cap( $cap, $user_id ) {
                // Disallow unfiltered_html for all users, even admins and super admins.
                if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
                        $caps[] = 'do_not_allow';
                // Disallow unfiltered_html for all users, even admins and super admins.
                if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
                        $caps[] = 'do_not_allow';

+               elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+                       $caps[] = $cap;

                else
                        $caps[] = $cap;
                break;
                else
                        $caps[] = $cap;
                break;