<!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>[50997] trunk/src: Adds the widgets block editor to widgets.php and customize.php</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/50997">50997</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/50997","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>noisysocks</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-25 08:51:09 +0000 (Tue, 25 May 2021)</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'>Adds the widgets block editor to widgets.php and customize.php
Moves the widgets block editor from Gutenberg into WordPress Core.
- Adds @wordpress/edit-widgets, @wordpress/customize-widgets and
@wordpress/widgets.
- Modifies wp-admin/widgets.php to branch between the old editor and new editor
depending on wp_use_widgets_block_editor().
- Modifies WP_Customize_Widgets to branch between the old editor control and new
editor control depending on wp_use_widgets_block_editor().
Follows <a href="https://core.trac.wordpress.org/changeset/50996">[50996]</a> which was missing these files.
See <a href="https://core.trac.wordpress.org/ticket/51506">#51506</a>.
Props isabel_brison, TimothyBlynJacobs, andraganescu, kevin940726, talldanwp.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadminwidgetsformblocksphp">trunk/src/wp-admin/widgets-form-blocks.php</a></li>
<li><a href="#trunksrcwpadminwidgetsformphp">trunk/src/wp-admin/widgets-form.php</a></li>
<li>trunk/src/wp-includes/blocks/legacy-widget/</li>
<li><a href="#trunksrcwpincludesblockslegacywidgetblockjson">trunk/src/wp-includes/blocks/legacy-widget/block.json</a></li>
<li><a href="#trunksrcwpincludesblockslegacywidgetphp">trunk/src/wp-includes/blocks/legacy-widget.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpsidebarblockeditorcontrolphp">trunk/src/wp-includes/customize/class-wp-sidebar-block-editor-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminwidgetsformblocksphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-admin/widgets-form-blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets-form-blocks.php (rev 0)
+++ trunk/src/wp-admin/widgets-form-blocks.php 2021-05-25 08:51:09 UTC (rev 50997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,66 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The block-based widgets editor, for use in widgets.php.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+// Don't load directly.
+if ( ! defined( 'ABSPATH' ) ) {
+ die( '-1' );
+}
+
+// Flag that we're loading the block editor.
+$current_screen = get_current_screen();
+$current_screen->is_block_editor( true );
+
+$block_editor_context = new WP_Block_Editor_Context();
+
+$preload_paths = array(
+ array( '/wp/v2/media', 'OPTIONS' ),
+ '/wp/v2/sidebars?context=edit&per_page=-1',
+ '/wp/v2/widgets?context=edit&per_page=-1&_embed=about',
+);
+block_editor_rest_api_preload( $preload_paths, $block_editor_context );
+
+$editor_settings = get_block_editor_settings( array(), $block_editor_context );
+
+wp_add_inline_script(
+ 'wp-edit-widgets',
+ sprintf(
+ 'wp.domReady( function() {
+ wp.editWidgets.initialize( "widgets-editor", %s );
+ } );',
+ wp_json_encode( $editor_settings )
+ )
+);
+
+// Preload server-registered block schemas.
+wp_add_inline_script(
+ 'wp-blocks',
+ 'wp.blocks.unstable__bootstrapServerSideBlockDefinitions(' . wp_json_encode( get_block_editor_server_block_settings() ) . ');'
+);
+
+wp_add_inline_script(
+ 'wp-blocks',
+ sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( 'widgets-editor' ) ) ),
+ 'after'
+);
+
+wp_enqueue_script( 'wp-edit-widgets' );
+wp_enqueue_script( 'admin-widgets' );
+wp_enqueue_script( 'wp-format-library' );
+wp_enqueue_style( 'wp-edit-widgets' );
+wp_enqueue_style( 'wp-format-library' );
+
+/** This action is documented in edit-form-blocks.php */
+do_action( 'enqueue_block_editor_assets' );
+
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
+
+<div id="widgets-editor" class="blocks-widgets-container"></div>
+
+<?php
+require_once ABSPATH . 'wp-admin/admin-footer.php';
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-admin/widgets-form-blocks.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpadminwidgetsformphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-admin/widgets-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets-form.php (rev 0)
+++ trunk/src/wp-admin/widgets-form.php 2021-05-25 08:51:09 UTC (rev 50997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,570 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The classic widget administration screen, for use in widgets.php.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+// Don't load directly.
+if ( ! defined( 'ABSPATH' ) ) {
+ die( '-1' );
+}
+
+$widgets_access = get_user_setting( 'widgets_access' );
+if ( isset( $_GET['widgets-access'] ) ) {
+ check_admin_referer( 'widgets-access' );
+
+ $widgets_access = 'on' === $_GET['widgets-access'] ? 'on' : 'off';
+ set_user_setting( 'widgets_access', $widgets_access );
+}
+
+if ( 'on' === $widgets_access ) {
+ add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+} else {
+ wp_enqueue_script( 'admin-widgets' );
+
+ if ( wp_is_mobile() ) {
+ wp_enqueue_script( 'jquery-touch-punch' );
+ }
+}
+
+/**
+ * Fires early before the Widgets administration screen loads,
+ * after scripts are enqueued.
+ *
+ * @since 2.2.0
+ */
+do_action( 'sidebar_admin_setup' );
+
+get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' ),
+ 'content' =>
+ '<p>' . __( 'Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.' ) . '</p>
+ <p>' . __( 'The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.' ) . '</p>',
+ )
+);
+get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'removing-reusing',
+ 'title' => __( 'Removing and Reusing' ),
+ 'content' =>
+ '<p>' . __( 'If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.' ) . '</p>
+ <p>' . __( 'Widgets may be used multiple times. You can give each widget a title, to display on your site, but it’s not required.' ) . '</p>
+ <p>' . __( 'Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.' ) . '</p>',
+ )
+);
+get_current_screen()->add_help_tab(
+ array(
+ 'id' => 'missing-widgets',
+ 'title' => __( 'Missing Widgets' ),
+ 'content' =>
+ '<p>' . __( 'Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.' ) . '</p>' .
+ '<p>' . __( 'When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.' ) . '</p>',
+ )
+);
+
+get_current_screen()->set_help_sidebar(
+ '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/article/appearance-widgets-screen/">Documentation on Widgets</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+);
+
+if ( ! current_theme_supports( 'widgets' ) ) {
+ wp_die( __( 'The theme you are currently using isn’t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://developer.wordpress.org/themes/functionality/widgets/">follow these instructions</a>.' ) );
+}
+
+// These are the widgets grouped by sidebar.
+$sidebars_widgets = wp_get_sidebars_widgets();
+
+if ( empty( $sidebars_widgets ) ) {
+ $sidebars_widgets = wp_get_widget_defaults();
+}
+
+foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
+ if ( 'wp_inactive_widgets' === $sidebar_id ) {
+ continue;
+ }
+
+ if ( ! is_registered_sidebar( $sidebar_id ) ) {
+ if ( ! empty( $widgets ) ) { // Register the inactive_widgets area as sidebar.
+ register_sidebar(
+ array(
+ 'name' => __( 'Inactive Sidebar (not used)' ),
+ 'id' => $sidebar_id,
+ 'class' => 'inactive-sidebar orphan-sidebar',
+ 'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+ 'before_widget' => '',
+ 'after_widget' => '',
+ 'before_title' => '',
+ 'after_title' => '',
+ )
+ );
+ } else {
+ unset( $sidebars_widgets[ $sidebar_id ] );
+ }
+ }
+}
+
+// Register the inactive_widgets area as sidebar.
+register_sidebar(
+ array(
+ 'name' => __( 'Inactive Widgets' ),
+ 'id' => 'wp_inactive_widgets',
+ 'class' => 'inactive-sidebar',
+ 'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+ 'before_widget' => '',
+ 'after_widget' => '',
+ 'before_title' => '',
+ 'after_title' => '',
+ )
+);
+
+retrieve_widgets();
+
+// We're saving a widget without JS.
+if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
+ $widget_id = $_POST['widget-id'];
+ check_admin_referer( "save-delete-widget-$widget_id" );
+
+ $number = isset( $_POST['multi_number'] ) ? (int) $_POST['multi_number'] : '';
+ if ( $number ) {
+ foreach ( $_POST as $key => $val ) {
+ if ( is_array( $val ) && preg_match( '/__i__|%i%/', key( $val ) ) ) {
+ $_POST[ $key ] = array( $number => array_shift( $val ) );
+ break;
+ }
+ }
+ }
+
+ $sidebar_id = $_POST['sidebar'];
+ $position = isset( $_POST[ $sidebar_id . '_position' ] ) ? (int) $_POST[ $sidebar_id . '_position' ] - 1 : 0;
+
+ $id_base = $_POST['id_base'];
+ $sidebar = isset( $sidebars_widgets[ $sidebar_id ] ) ? $sidebars_widgets[ $sidebar_id ] : array();
+
+ // Delete.
+ if ( isset( $_POST['removewidget'] ) && $_POST['removewidget'] ) {
+
+ if ( ! in_array( $widget_id, $sidebar, true ) ) {
+ wp_redirect( admin_url( 'widgets.php?error=0' ) );
+ exit;
+ }
+
+ $sidebar = array_diff( $sidebar, array( $widget_id ) );
+ $_POST = array(
+ 'sidebar' => $sidebar_id,
+ 'widget-' . $id_base => array(),
+ 'the-widget-id' => $widget_id,
+ 'delete_widget' => '1',
+ );
+
+ /**
+ * Fires immediately after a widget has been marked for deletion.
+ *
+ * @since 4.4.0
+ *
+ * @param string $widget_id ID of the widget marked for deletion.
+ * @param string $sidebar_id ID of the sidebar the widget was deleted from.
+ * @param string $id_base ID base for the widget.
+ */
+ do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
+ }
+
+ $_POST['widget-id'] = $sidebar;
+
+ foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
+ if ( $name !== $id_base || ! is_callable( $control['callback'] ) ) {
+ continue;
+ }
+
+ ob_start();
+ call_user_func_array( $control['callback'], $control['params'] );
+ ob_end_clean();
+
+ break;
+ }
+
+ $sidebars_widgets[ $sidebar_id ] = $sidebar;
+
+ // Remove old position.
+ if ( ! isset( $_POST['delete_widget'] ) ) {
+ foreach ( $sidebars_widgets as $key => $sb ) {
+ if ( is_array( $sb ) ) {
+ $sidebars_widgets[ $key ] = array_diff( $sb, array( $widget_id ) );
+ }
+ }
+ array_splice( $sidebars_widgets[ $sidebar_id ], $position, 0, $widget_id );
+ }
+
+ wp_set_sidebars_widgets( $sidebars_widgets );
+ wp_redirect( admin_url( 'widgets.php?message=0' ) );
+ exit;
+}
+
+// Remove inactive widgets without JS.
+if ( isset( $_POST['removeinactivewidgets'] ) ) {
+ check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
+
+ if ( $_POST['removeinactivewidgets'] ) {
+ foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+ $pieces = explode( '-', $widget_id );
+ $multi_number = array_pop( $pieces );
+ $id_base = implode( '-', $pieces );
+ $widget = get_option( 'widget_' . $id_base );
+ unset( $widget[ $multi_number ] );
+ update_option( 'widget_' . $id_base, $widget );
+ unset( $sidebars_widgets['wp_inactive_widgets'][ $key ] );
+ }
+
+ wp_set_sidebars_widgets( $sidebars_widgets );
+ }
+
+ wp_redirect( admin_url( 'widgets.php?message=0' ) );
+ exit;
+}
+
+// Output the widget form without JS.
+if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
+ $widget_id = $_GET['editwidget'];
+
+ if ( isset( $_GET['addnew'] ) ) {
+ // Default to the first sidebar.
+ $keys = array_keys( $wp_registered_sidebars );
+ $sidebar = reset( $keys );
+
+ if ( isset( $_GET['base'] ) && isset( $_GET['num'] ) ) { // Multi-widget.
+ // Copy minimal info from an existing instance of this widget to a new instance.
+ foreach ( $wp_registered_widget_controls as $control ) {
+ if ( $_GET['base'] === $control['id_base'] ) {
+ $control_callback = $control['callback'];
+ $multi_number = (int) $_GET['num'];
+ $control['params'][0]['number'] = -1;
+ $control['id'] = $control['id_base'] . '-' . $multi_number;
+ $widget_id = $control['id'];
+ $wp_registered_widget_controls[ $control['id'] ] = $control;
+ break;
+ }
+ }
+ }
+ }
+
+ if ( isset( $wp_registered_widget_controls[ $widget_id ] ) && ! isset( $control ) ) {
+ $control = $wp_registered_widget_controls[ $widget_id ];
+ $control_callback = $control['callback'];
+ } elseif ( ! isset( $wp_registered_widget_controls[ $widget_id ] ) && isset( $wp_registered_widgets[ $widget_id ] ) ) {
+ $name = esc_html( strip_tags( $wp_registered_widgets[ $widget_id ]['name'] ) );
+ }
+
+ if ( ! isset( $name ) ) {
+ $name = esc_html( strip_tags( $control['name'] ) );
+ }
+
+ if ( ! isset( $sidebar ) ) {
+ $sidebar = isset( $_GET['sidebar'] ) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+ }
+
+ if ( ! isset( $multi_number ) ) {
+ $multi_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
+ }
+
+ $id_base = isset( $control['id_base'] ) ? $control['id_base'] : $control['id'];
+
+ // Show the widget form.
+ $width = ' style="width:' . max( $control['width'], 350 ) . 'px"';
+ $key = isset( $_GET['key'] ) ? (int) $_GET['key'] : 0;
+
+ require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+ <div class="wrap">
+ <h1><?php echo esc_html( $title ); ?></h1>
+ <div class="editwidget"<?php echo $width; ?>>
+ <h2>
+ <?php
+ /* translators: %s: Widget name. */
+ printf( __( 'Widget %s' ), $name );
+ ?>
+ </h2>
+
+ <form action="widgets.php" method="post">
+ <div class="widget-inside">
+ <?php
+ if ( is_callable( $control_callback ) ) {
+ call_user_func_array( $control_callback, $control['params'] );
+ } else {
+ echo '<p>' . __( 'There are no options for this widget.' ) . "</p>\n";
+ }
+ ?>
+ </div>
+
+ <p class="describe"><?php _e( 'Select both the sidebar for this widget and the position of the widget in that sidebar.' ); ?></p>
+ <div class="widget-position">
+ <table class="widefat"><thead><tr><th><?php _e( 'Sidebar' ); ?></th><th><?php _e( 'Position' ); ?></th></tr></thead><tbody>
+ <?php
+ foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
+ echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
+ if ( 'wp_inactive_widgets' === $sbname || 'orphaned_widgets' === substr( $sbname, 0, 16 ) ) {
+ echo ' ';
+ } else {
+ if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
+ $j = 1;
+ $sidebars_widgets[ $sbname ] = array();
+ } else {
+ $j = count( $sidebars_widgets[ $sbname ] );
+ if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+ $j++;
+ }
+ }
+ $selected = '';
+ echo "\t\t<select name='{$sbname}_position'>\n";
+ echo "\t\t<option value=''>" . __( '— Select —' ) . "</option>\n";
+ for ( $i = 1; $i <= $j; $i++ ) {
+ if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+ $selected = selected( $i, $key + 1, false );
+ }
+ echo "\t\t<option value='$i'$selected> $i </option>\n";
+ }
+ echo "\t\t</select>\n";
+ }
+ echo "</td></tr>\n";
+ }
+ ?>
+ </tbody></table>
+ </div>
+
+ <div class="widget-control-actions">
+ <div class="alignleft">
+ <?php if ( ! isset( $_GET['addnew'] ) ) : ?>
+ <input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php _e( 'Delete' ); ?>" />
+ <span class="widget-control-close-wrapper">
+ | <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
+ </span>
+ <?php else : ?>
+ <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
+ <?php endif; ?>
+ </div>
+ <div class="alignright">
+ <?php submit_button( __( 'Save Widget' ), 'primary alignright', 'savewidget', false ); ?>
+ <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $widget_id ); ?>" />
+ <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
+ <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
+ <?php wp_nonce_field( "save-delete-widget-$widget_id" ); ?>
+ </div>
+ <br class="clear" />
+ </div>
+
+ </form>
+ </div>
+ </div>
+ <?php
+ require_once ABSPATH . 'wp-admin/admin-footer.php';
+ exit;
+}
+
+$messages = array(
+ __( 'Changes saved.' ),
+);
+
+$errors = array(
+ __( 'Error while saving.' ),
+ __( 'Error in displaying the widget settings form.' ),
+);
+
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
+
+<div class="wrap">
+<h1 class="wp-heading-inline">
+<?php
+echo esc_html( $title );
+?>
+</h1>
+
+<?php
+if ( current_user_can( 'customize' ) ) {
+ printf(
+ ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
+ esc_url(
+ add_query_arg(
+ array(
+ array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+ 'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+ ),
+ admin_url( 'customize.php' )
+ )
+ ),
+ __( 'Manage with Live Preview' )
+ );
+}
+
+$nonce = wp_create_nonce( 'widgets-access' );
+?>
+<div class="widget-access-link">
+ <a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=<?php echo urlencode( $nonce ); ?>"><?php _e( 'Enable accessibility mode' ); ?></a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=<?php echo urlencode( $nonce ); ?>"><?php _e( 'Disable accessibility mode' ); ?></a>
+</div>
+
+<hr class="wp-header-end">
+
+<?php if ( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { ?>
+<div id="message" class="updated notice is-dismissible"><p><?php echo $messages[ $_GET['message'] ]; ?></p></div>
+<?php } ?>
+<?php if ( isset( $_GET['error'] ) && isset( $errors[ $_GET['error'] ] ) ) { ?>
+<div id="message" class="error"><p><?php echo $errors[ $_GET['error'] ]; ?></p></div>
+<?php } ?>
+
+<?php
+/**
+ * Fires before the Widgets administration page content loads.
+ *
+ * @since 3.0.0
+ */
+do_action( 'widgets_admin_page' );
+?>
+
+<div class="widget-liquid-left">
+<div id="widgets-left">
+ <div id="available-widgets" class="widgets-holder-wrap">
+ <div class="sidebar-name">
+ <button type="button" class="handlediv hide-if-no-js" aria-expanded="true">
+ <span class="screen-reader-text"><?php _e( 'Available Widgets' ); ?></span>
+ <span class="toggle-indicator" aria-hidden="true"></span>
+ </button>
+ <h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
+ </div>
+ <div class="widget-holder">
+ <div class="sidebar-description">
+ <p class="description"><?php _e( 'To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back.' ); ?></p>
+ </div>
+ <div id="widget-list">
+ <?php wp_list_widgets(); ?>
+ </div>
+ <br class='clear' />
+ </div>
+ <br class="clear" />
+ </div>
+
+<?php
+
+$theme_sidebars = array();
+foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
+ if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+ $wrap_class = 'widgets-holder-wrap';
+ if ( ! empty( $registered_sidebar['class'] ) ) {
+ $wrap_class .= ' ' . $registered_sidebar['class'];
+ }
+
+ $is_inactive_widgets = 'wp_inactive_widgets' === $registered_sidebar['id'];
+ ?>
+ <div class="<?php echo esc_attr( $wrap_class ); ?>">
+ <div class="widget-holder inactive">
+ <?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+
+ <?php if ( $is_inactive_widgets ) { ?>
+ <div class="remove-inactive-widgets">
+ <form action="" method="post">
+ <p>
+ <?php
+ $attributes = array( 'id' => 'inactive-widgets-control-remove' );
+
+ if ( empty( $sidebars_widgets['wp_inactive_widgets'] ) ) {
+ $attributes['disabled'] = '';
+ }
+
+ submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+ ?>
+ <span class="spinner"></span>
+ </p>
+ <?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+ </form>
+ </div>
+ <?php } ?>
+ </div>
+ <?php if ( $is_inactive_widgets ) { ?>
+ <p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+ <?php } ?>
+ </div>
+ <?php
+
+ } else {
+ $theme_sidebars[ $sidebar ] = $registered_sidebar;
+ }
+}
+
+?>
+</div>
+</div>
+<?php
+
+$i = 0;
+$split = 0;
+$single_sidebar_class = '';
+$sidebars_count = count( $theme_sidebars );
+
+if ( $sidebars_count > 1 ) {
+ $split = (int) ceil( $sidebars_count / 2 );
+} else {
+ $single_sidebar_class = ' single-sidebar';
+}
+
+?>
+<div class="widget-liquid-right">
+<div id="widgets-right" class="wp-clearfix<?php echo $single_sidebar_class; ?>">
+<div class="sidebars-column-1">
+<?php
+
+foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+ $wrap_class = 'widgets-holder-wrap';
+ if ( ! empty( $registered_sidebar['class'] ) ) {
+ $wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+ }
+
+ if ( $i > 0 ) {
+ $wrap_class .= ' closed';
+ }
+
+ if ( $split && $i === $split ) {
+ ?>
+ </div><div class="sidebars-column-2">
+ <?php
+ }
+
+ ?>
+ <div class="<?php echo esc_attr( $wrap_class ); ?>">
+ <?php
+ // Show the control forms for each of the widgets in this sidebar.
+ wp_list_widget_controls( $sidebar, $registered_sidebar['name'] );
+ ?>
+ </div>
+ <?php
+
+ $i++;
+}
+
+?>
+</div>
+</div>
+</div>
+<form method="post">
+<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+</form>
+<br class="clear" />
+</div>
+
+<div class="widgets-chooser">
+ <ul class="widgets-chooser-sidebars"></ul>
+ <div class="widgets-chooser-actions">
+ <button class="button widgets-chooser-cancel"><?php _e( 'Cancel' ); ?></button>
+ <button class="button button-primary widgets-chooser-add"><?php _e( 'Add Widget' ); ?></button>
+ </div>
+</div>
+
+<?php
+
+/**
+ * Fires after the available widgets and sidebars have loaded, before the admin footer.
+ *
+ * @since 2.2.0
+ */
+do_action( 'sidebar_admin_page' );
+require_once ABSPATH . 'wp-admin/admin-footer.php';
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-admin/widgets-form.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesblockslegacywidgetblockjson"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/blocks/legacy-widget/block.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/legacy-widget/block.json (rev 0)
+++ trunk/src/wp-includes/blocks/legacy-widget/block.json 2021-05-25 08:51:09 UTC (rev 50997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,28 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+ "apiVersion": 2,
+ "name": "core/legacy-widget",
+ "title": "Legacy Widget",
+ "category": "widgets",
+ "description": "Display a legacy widget.",
+ "textdomain": "default",
+ "attributes": {
+ "id": {
+ "type": "string",
+ "default": null
+ },
+ "idBase": {
+ "type": "string",
+ "default": null
+ },
+ "instance": {
+ "type": "object",
+ "default": null
+ }
+ },
+ "supports": {
+ "html": false,
+ "customClassName": false,
+ "reusable": false
+ },
+ "editorStyle": "wp-block-legacy-widget-editor"
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/legacy-widget/block.json
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesblockslegacywidgetphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/blocks/legacy-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks/legacy-widget.php (rev 0)
+++ trunk/src/wp-includes/blocks/legacy-widget.php 2021-05-25 08:51:09 UTC (rev 50997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,111 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Server-side rendering of the `core/legacy-widget` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the 'core/legacy-widget' block.
+ *
+ * @param array $attributes The block attributes.
+ *
+ * @return string Rendered block.
+ */
+function render_block_core_legacy_widget( $attributes ) {
+ if ( isset( $attributes['id'] ) ) {
+ $sidebar_id = gutenberg_find_widgets_sidebar( $attributes['id'] );
+ return gutenberg_render_widget( $attributes['id'], $sidebar_id );
+ }
+
+ if ( ! isset( $attributes['idBase'] ) ) {
+ return '';
+ }
+
+ $widget_object = gutenberg_get_widget_object( $attributes['idBase'] );
+
+ if ( ! $widget_object ) {
+ return '';
+ }
+
+ if ( isset( $attributes['instance']['encoded'], $attributes['instance']['hash'] ) ) {
+ $serialized_instance = base64_decode( $attributes['instance']['encoded'] );
+ if ( wp_hash( $serialized_instance ) !== $attributes['instance']['hash'] ) {
+ return '';
+ }
+ $instance = unserialize( $serialized_instance );
+ } else {
+ $instance = array();
+ }
+
+ ob_start();
+ the_widget( get_class( $widget_object ), $instance );
+ return ob_get_clean();
+}
+
+/**
+ * Registers the 'core/legacy-widget' block.
+ */
+function register_block_core_legacy_widget() {
+ register_block_type_from_metadata(
+ __DIR__ . '/legacy-widget',
+ array(
+ 'render_callback' => 'render_block_core_legacy_widget',
+ )
+ );
+}
+
+add_action( 'init', 'register_block_core_legacy_widget', 20 );
+
+/**
+ * Intercepts any request with legacy-widget-preview in the query param and, if
+ * set, renders a page containing a preview of the requested Legacy Widget
+ * block.
+ */
+function handle_legacy_widget_preview_iframe() {
+ if ( empty( $_GET['legacy-widget-preview'] ) ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'edit_theme_options' ) ) {
+ return;
+ }
+
+ define( 'IFRAME_REQUEST', true );
+
+ ?>
+ <!doctype html>
+ <html <?php language_attributes(); ?>>
+ <head>
+ <meta charset="<?php bloginfo( 'charset' ); ?>" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="profile" href="https://gmpg.org/xfn/11" />
+ <?php wp_head(); ?>
+ <style>
+ /* Reset theme styles */
+ html, body, #page, #content {
+ background: #FFF !important;
+ padding: 0 !important;
+ margin: 0 !important;
+ }
+ </style>
+ </head>
+ <body <?php body_class(); ?>>
+ <div id="page" class="site">
+ <div id="content" class="site-content">
+ <?php
+ $registry = WP_Block_Type_Registry::get_instance();
+ $block = $registry->get_registered( 'core/legacy-widget' );
+ echo $block->render( $_GET['legacy-widget-preview'] );
+ ?>
+ </div><!-- #content -->
+ </div><!-- #page -->
+ <?php wp_footer(); ?>
+ </body>
+ </html>
+ <?php
+
+ exit;
+}
+
+add_action( 'init', 'handle_legacy_widget_preview_iframe', 21 );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/blocks/legacy-widget.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludescustomizeclasswpsidebarblockeditorcontrolphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/customize/class-wp-sidebar-block-editor-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-sidebar-block-editor-control.php (rev 0)
+++ trunk/src/wp-includes/customize/class-wp-sidebar-block-editor-control.php 2021-05-25 08:51:09 UTC (rev 50997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,37 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Customize API: WP_Sidebar_Block_Editor_Control class.
+ *
+ * @package WordPress
+ * @subpackage Customize
+ * @since 5.8.0
+ */
+
+/**
+ * Core class used to implement the widgets block editor control in the
+ * customizer.
+ *
+ * @since 5.8.0
+ *
+ * @see WP_Customize_Control
+ */
+class WP_Sidebar_Block_Editor_Control extends WP_Customize_Control {
+ /**
+ * The control type.
+ *
+ * @since 5.8.0
+ *
+ * @var string
+ */
+ public $type = 'sidebar_block_editor';
+
+ /**
+ * Render the widgets block editor container.
+ *
+ * @since 5.8.0
+ */
+ public function render_content() {
+ // Render an empty control. The JavaScript in
+ // @wordpress/customize-widgets will do the rest.
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/customize/class-wp-sidebar-block-editor-control.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>