sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Themes: Enhance filtering options for allowed themes on a network. 

* Move the legacy `allowed_themes` filter to `WP_Theme::get_allowed_on_network()`, where it will continue to filter themes allowed on the network.
* Add `network_allowed_themes` filter to `WP_Theme::get_allowed()` and pass `$blog_id` to provide context.
* Add `site_allowed_themes` filter to `WP_Theme::get_allowed_on_site()` and pass `$blog_id` to provide context.

Props pauldewouters, lamosty, michalzuber, dmsnell, johnnypea, rob.
Fixes #28436.


git-svn-id: https://develop.svn.wordpress.org/trunk@36366 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2016-01-20 18:28:33 +00:00
parent 8ae1899929
commit 77f8c5fc07
2 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/wp-includes/class-wp-theme.php
View File

@ -1177,18 +1177,22 @@ final class WP_Theme implements ArrayAccess {
* @static
* @access public
*
* @param int $blog_id Optional. Defaults to current blog.
* @param int $blog_id Optional. ID of the site. Defaults to the current site.
* @return array Array of stylesheet names.
*/
public static function get_allowed( $blog_id = null ) {
/**
* Filter the array of themes allowed on the site or network.
* Filter the array of themes allowed on the network.
*
* @since MU
* Site is provided as context so that a list of network allowed themes can
* be filtered further.
*
* @since 4.5.0
*
* @param array $allowed_themes An array of theme stylesheet names.
* @param int $blog_id ID of the site.
*/
$network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
$network = (array) apply_filters( 'network_allowed_themes', self::get_allowed_on_network(), $blog_id );
return $network + self::get_allowed_on_site( $blog_id );
}
@ -1206,8 +1210,19 @@ final class WP_Theme implements ArrayAccess {
*/
public static function get_allowed_on_network() {
static $allowed_themes;
if ( ! isset( $allowed_themes ) )
if ( ! isset( $allowed_themes ) ) {
$allowed_themes = (array) get_site_option( 'allowedthemes' );
}
/**
* Filter the array of themes allowed on the network.
*
* @since MU
*
* @param array $allowed_themes An array of theme stylesheet names.
*/
$allowed_themes = apply_filters( 'allowed_themes', $allowed_themes );
return $allowed_themes;
}
@ -1221,7 +1236,7 @@ final class WP_Theme implements ArrayAccess {
*
* @staticvar array $allowed_themes
*
* @param int $blog_id Optional. Defaults to current blog.
* @param int $blog_id Optional. ID of the site. Defaults to the current site.
* @return array Array of stylesheet names.
*/
public static function get_allowed_on_site( $blog_id = null ) {
@ -1230,8 +1245,17 @@ final class WP_Theme implements ArrayAccess {
if ( ! $blog_id || ! is_multisite() )
$blog_id = get_current_blog_id();
if ( isset( $allowed_themes[ $blog_id ] ) )
return $allowed_themes[ $blog_id ];
if ( isset( $allowed_themes[ $blog_id ] ) ) {
/**
* Filter the array of themes allowed on the site.
*
* @since 4.5.0
*
* @param array $allowed_themes An array of theme stylesheet names.
* @param int $blog_id ID of the site. Defaults to current site.
*/
return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
}
$current = $blog_id == get_current_blog_id();
@ -1279,7 +1303,8 @@ final class WP_Theme implements ArrayAccess {
}
}
return (array) $allowed_themes[ $blog_id ];
/** This filter is documented in wp-includes/class-wp-theme.php */
return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
}
/**

66
tests/phpunit/tests/theme/getAllowedFilters.php
View File

@ -1,8 +1,10 @@
<?php
if ( is_multisite() ) :
/**
* Tests specific to the filtering of `WP_Theme::get_allowed()` and related functions.
*
* @group themes
* @group multisite
*/
class Tests_WP_Theme_Get_Allowed_Filters extends WP_UnitTestCase {
/**
@ -10,6 +12,19 @@ class Tests_WP_Theme_Get_Allowed_Filters extends WP_UnitTestCase {
*/
protected $default_allowed;
protected $filter_network_allowed_themes_args;
public function test_network_allowed_themes_filter_sends_blog_id() {
$blog_id = 1;
add_filter( 'network_allowed_themes', array( $this, 'filter_network_allowed_themes' ), 10, 2 );
WP_Theme::get_allowed( $blog_id );
remove_filter( 'network_allowed_themes', array( $this, 'filter_network_allowed_themes' ) );
$this->assertEquals( 2, count( $this->filter_network_allowed_themes_args ) );
$this->assertEquals( $blog_id, $this->filter_network_allowed_themes_args[1] );
}
/**
* Test the `allowed_themes` filter, which filters themes allowed on a network.
*/
@ -27,9 +42,58 @@ class Tests_WP_Theme_Get_Allowed_Filters extends WP_UnitTestCase {
$this->assertEquals( $expected, $allowed );
}
/**
* Test the `network_allowed_themes` filter, which filters allowed themes on the network and provides `$blog_id`.
*/
public function test_wp_theme_get_allowed_with_network_allowed_themes_filter() {
$blog_id = 1;
$this->default_allowed = WP_Theme::get_allowed( $blog_id );
add_filter( 'network_allowed_themes', array( $this, 'filter_network_allowed_themes' ), 10, 2 );
$allowed = WP_Theme::get_allowed( $blog_id );
remove_filter( 'network_allowed_themes', array( $this, 'filter_network_allowed_themes' ), 10 );
$expected = $this->default_allowed + array( 'network-allowed-theme' => true );
$this->assertEquals( $expected, $allowed );
}
/**
* Test the `site_allowed_themes` filter, which filters allowed themes for a site and provides `$blog_id`.
*/
public function test_wp_theme_get_allowed_with_site_allowed_themes_filter() {
$blog_id = 1;
$this->default_allowed = WP_Theme::get_allowed( $blog_id );
add_filter( 'site_allowed_themes', array( $this, 'filter_site_allowed_themes' ), 10, 2 );
$allowed = WP_Theme::get_allowed( $blog_id );
remove_filter( 'site_allowed_themes', array( $this, 'filter_site_allowed_themes' ), 10 );
$expected = $this->default_allowed + array( 'site-allowed-theme' => true );
$this->assertEquals( $expected, $allowed );
}
public function filter_allowed_themes( $allowed_themes ) {
$allowed_themes['allow-on-network'] = true;
return $allowed_themes;
}
}
public function filter_network_allowed_themes( $allowed_themes, $blog_id ) {
$this->filter_network_allowed_themes_args = func_get_args();
$allowed_themes['network-allowed-theme'] = true;
return $allowed_themes;
}
public function filter_site_allowed_themes( $allowed_themes, $blog_id ) {
$allowed_themes['site-allowed-theme'] = true;
return $allowed_themes;
}
}
endif;