Changeset 20232

Timestamp:

03/21/2012 04:59:57 AM (12 years ago)

Author:

koopersmith

Message:

Theme Customizer: Improve WP_Customize_Setting->check_capabilities(). Add support for arrays in WP_Customize_Setting->capability and WP_Customize_Setting->theme_supports. Don't bail when WP_Customize_Setting->capability is empty. see #19910.

Location:

trunk/wp-includes

Files:

• class-wp-customize-section.php (modified) (1 diff)
• class-wp-customize-setting.php (modified) (1 diff)

trunk/wp-includes/class-wp-customize-section.php

@@ -47 +47 @@
      */
     function check_capabilities() {
-        if ( ! $this->capability || ! current_user_can( $this->capability ) )
+        if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
             return false;
 
-        if ( $this->theme_supports && ! current_theme_supports( $this->theme_supports ) )
+        if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
             return false;
 

trunk/wp-includes/class-wp-customize-setting.php

@@ -268 +268 @@
         global $customize;
 
-        if ( ! $this->capability || ! current_user_can( $this->capability ) )
+        if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
             return false;
 
-        if ( $this->theme_supports && ! current_theme_supports( $this->theme_supports ) )
+        if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
             return false;