<!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>[43954] branches/5.0: Update `sidebars_widgets` to match Twenty Nineteen's single widget area</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 { white-space: pre-line; 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/43954">43954</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/43954","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>mcsf</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-11-30 20:24:42 +0000 (Fri, 30 Nov 2018)</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'>Update `sidebars_widgets` to match Twenty Nineteen's single widget area
* Also update the customizer tests to match it.
Props SergeyBiryukov, pento.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50srcwpadminincludesclasswpthemeinstalllisttablephp">branches/5.0/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#branches50srcwpadminincludesupgradephp">branches/5.0/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#branches50srcwpadminnavmenusphp">branches/5.0/src/wp-admin/nav-menus.php</a></li>
<li><a href="#branches50testsphpunittestscustomizewidgetsphp">branches/5.0/tests/phpunit/tests/customize/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50srcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-admin/includes/class-wp-theme-install-list-table.php 2018-11-30 16:26:13 UTC (rev 43953)
+++ branches/5.0/src/wp-admin/includes/class-wp-theme-install-list-table.php 2018-11-30 20:24:42 UTC (rev 43954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,15 +230,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $theme {
</span><span class="cx" style="display: block; padding: 0 10px"> * An object that contains theme data returned by the WordPress.org API.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $name Theme name, e.g. 'Twenty Seventeen'.
- * @type string $slug Theme slug, e.g. 'twentyseventeen'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $name Theme name, e.g. 'Twenty Nineteen'.
+ * @type string $slug Theme slug, e.g. 'twentynineteen'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $version Theme version, e.g. '1.1'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $author Theme author username, e.g. 'melchoyce'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $preview_url Preview URL, e.g. 'http://2017.wordpress.net/'.
- * @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $preview_url Preview URL, e.g. 'http://2019.wordpress.net/'.
+ * @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentynineteen/'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type float $rating Rating score.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $num_ratings The number of ratings.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $homepage Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $homepage Theme homepage, e.g. 'https://wordpress.org/themes/twentynineteen/'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $description Theme description.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $download_link Theme ZIP download URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span></span></pre></div>
<a id="branches50srcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-admin/includes/upgrade.php 2018-11-30 16:26:13 UTC (rev 43953)
+++ branches/5.0/src/wp-admin/includes/upgrade.php 2018-11-30 20:24:42 UTC (rev 43954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'array_version' => 3 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $user_id, 'show_welcome_panel', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
</span></span></pre></div>
<a id="branches50srcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-admin/nav-menus.php 2018-11-30 16:26:13 UTC (rev 43953)
+++ branches/5.0/src/wp-admin/nav-menus.php 2018-11-30 20:24:42 UTC (rev 43954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $locations_screen ) : // Main tab
</span><span class="cx" style="display: block; padding: 0 10px"> $overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Seventeen', 'Twenty Nineteen' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
</span></span></pre></div>
<a id="branches50testsphpunittestscustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/tests/phpunit/tests/customize/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/tests/phpunit/tests/customize/widgets.php 2018-11-30 16:26:13 UTC (rev 43953)
+++ branches/5.0/tests/phpunit/tests/customize/widgets.php 2018-11-30 20:24:42 UTC (rev 43954)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS['_wp_sidebars_widgets'] ); // clear out cache set by wp_get_sidebars_widgets()
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebars_widgets = wp_get_sidebars_widgets();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1', 'sidebar-2', 'sidebar-3' ), array_keys( wp_get_sidebars_widgets() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( 'wp_inactive_widgets', 'sidebar-1' ), array_keys( wp_get_sidebars_widgets() ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'search-2', $sidebars_widgets['sidebar-1'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'categories-2', $sidebars_widgets['sidebar-1'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 2, get_option( 'widget_search' ) );
</span></span></pre>
</div>
</div>
</body>
</html>