<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37202] trunk: Multisite: Introduce `WP_Theme` methods to network enable/disable themes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37202">37202</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37202","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-14 03:39:45 +0000 (Thu, 14 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Introduce `WP_Theme` methods to network enable/disable themes.
* `WP_Theme::network_enable_theme()` can be used to enable a theme or array of themes on a network.
* `WP_Theme::network_disable_theme()` can be used to disable a theme or array of themes on a network.
* Use these new methods in the network admin vs direct `update_site_option()` calls.
* Add tests.
Props igmoweb.
Fixes <a href="https://core.trac.wordpress.org/ticket/30594">#30594</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunktestsphpunitteststhemeWPThemephp">trunk/tests/phpunit/tests/theme/WPTheme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnetworkthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2016-04-14 03:38:09 UTC (rev 37201)
+++ trunk/src/wp-admin/network/themes.php 2016-04-14 03:39:45 UTC (rev 37202)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = remove_query_arg( $temp_args, wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_themes = get_site_option( 'allowedthemes' );
</del><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enable':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('enable-theme_' . $_GET['theme']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_themes[ $_GET['theme'] ] = true;
- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Theme::network_enable_theme( $_GET['theme'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $referer, '/network/themes.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disable':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('disable-theme_' . $_GET['theme']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $allowed_themes[ $_GET['theme'] ] );
- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Theme::network_disable_theme( $_GET['theme'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enable-selected':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,9 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $themes as $theme )
- $allowed_themes[ $theme ] = true;
- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Theme::network_enable_theme( (array) $themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disable-selected':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,9 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $themes as $theme )
- unset( $allowed_themes[ $theme ] );
- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Theme::network_disable_theme( (array) $themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update-selected' :
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2016-04-14 03:38:09 UTC (rev 37201)
+++ trunk/src/wp-includes/class-wp-theme.php 2016-04-14 03:39:45 UTC (rev 37202)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1316,6 +1316,62 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enable a theme for all sites on the current network.
+ *
+ * @since 4.6.0
+ *
+ * @static
+ * @access public
+ *
+ * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
+ */
+ public static function network_enable_theme( $stylesheets ) {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ if ( ! is_array( $stylesheets ) ) {
+ $stylesheets = array( $stylesheets );
+ }
+
+ $allowed_themes = get_site_option( 'allowedthemes' );
+ foreach ( $stylesheets as $stylesheet ) {
+ $allowed_themes[ $stylesheet ] = true;
+ }
+
+ update_site_option( 'allowedthemes', $allowed_themes );
+ }
+
+ /**
+ * Disable a theme for all sites on the current network.
+ *
+ * @since 4.6.0
+ *
+ * @static
+ * @access public
+ *
+ * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
+ */
+ public static function network_disable_theme( $stylesheets ) {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ if ( ! is_array( $stylesheets ) ) {
+ $stylesheets = array( $stylesheets );
+ }
+
+ $allowed_themes = get_site_option( 'allowedthemes' );
+ foreach ( $stylesheets as $stylesheet ) {
+ if ( isset( $allowed_themes[ $stylesheet ] ) ) {
+ unset( $allowed_themes[ $stylesheet ] );
+ }
+ }
+
+ update_site_option( 'allowedthemes', $allowed_themes );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Sorts themes by name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span></span></pre></div>
<a id="trunktestsphpunitteststhemeWPThemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/WPTheme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/WPTheme.php 2016-04-14 03:38:09 UTC (rev 37201)
+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2016-04-14 03:39:45 UTC (rev 37202)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,4 +139,94 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $theme->get( 'Tags' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $theme->display( 'Tags' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+
+ /**
+ * Enable a single theme on a network.
+ *
+ * @ticket 30594
+ */
+ function test_wp_theme_network_enable_single_theme() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'This test requires multisite' );
+ }
+
+ $theme = 'testtheme-1';
+ $current_allowed_themes = get_site_option( 'allowedthemes' );
+ WP_Theme::network_enable_theme( $theme );
+ $new_allowed_themes = get_site_option( 'allowedthemes' );
+ update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.
+ $current_allowed_themes['testtheme-1'] = true; // Add the new theme to the previous set.
+
+ $this->assertEqualSetsWithIndex( $current_allowed_themes, $new_allowed_themes );
+ }
+
+ /**
+ * Enable multiple themes on a network.
+ *
+ * @ticket 30594
+ */
+ function test_wp_theme_network_enable_multiple_themes() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'This test requires multisite' );
+ }
+
+ $themes = array( 'testtheme-2', 'testtheme-3' );
+ $current_allowed_themes = get_site_option( 'allowedthemes' );
+ WP_Theme::network_enable_theme( $themes );
+ $new_allowed_themes = get_site_option( 'allowedthemes' );
+ update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.
+ $current_allowed_themes = array_merge( $current_allowed_themes, array( 'testtheme-2' => true, 'testtheme-3' => true ) );
+
+ $this->assertEqualSetsWithIndex( $current_allowed_themes, $new_allowed_themes );
+ }
+
+ /**
+ * Disable a single theme on a network.
+ *
+ * @ticket 30594
+ */
+ function test_network_disable_single_theme() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'This test requires multisite' );
+ }
+
+ $current_allowed_themes = get_site_option( 'allowedthemes' );
+
+ $allowed_themes = array( 'existing-1' => true, 'existing-2' => true, 'existing-3' => true );
+ update_site_option( 'allowedthemes', $allowed_themes );
+
+ $disable_theme = 'existing-2';
+ WP_Theme::network_disable_theme( $disable_theme );
+ $new_allowed_themes = get_site_option( 'allowedthemes' );
+ update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.
+ unset( $allowed_themes[ $disable_theme ] ); // Remove deleted theme from initial set.
+
+ $this->assertEqualSetsWithIndex( $allowed_themes, $new_allowed_themes );
+ }
+
+ /**
+ * Disable multiple themes on a network.
+ *
+ * @ticket 30594
+ */
+ function test_network_disable_multiple_themes() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( 'This test requires multisite' );
+ }
+
+ $current_allowed_themes = get_site_option( 'allowedthemes' );
+
+ $allowed_themes = array( 'existing-4' => true, 'existing-5' => true, 'existing-6' => true );
+ update_site_option( 'allowedthemes', $allowed_themes );
+
+ $disable_themes = array( 'existing-4', 'existing-5' );
+ WP_Theme::network_disable_theme( $disable_themes );
+ $new_allowed_themes = get_site_option( 'allowedthemes' );
+ update_site_option( 'allowedthemes', $current_allowed_themes ); // reset previous value.
+ unset( $allowed_themes['existing-4'] );
+ unset( $allowed_themes['existing-5'] );
+
+ $this->assertEqualSetsWithIndex( $allowed_themes, $new_allowed_themes );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>