enmi-conf.org: comparison wp/wp-admin/includes/widgets.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 	$sort = $wp_registered_widgets;
 	usort( $sort, '_sort_name_callback' );
 	$done = array();
 	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget
+		if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget.
 			continue;
 		}
 		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
 		$done[]  = $widget['callback'];
 			if ( $sidebar ) {
 				$args['_hide'] = '1';
 			}
 		}
-		$args = wp_list_widget_controls_dynamic_sidebar(
+		$control_args = array(
-			array(
+			0 => $args,
-				0 => $args,
+			1 => $widget['params'][0],
-				1 => $widget['params'][0],
-			)
 		);
-		call_user_func_array( 'wp_widget_control', $args );
+		$sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
+		wp_widget_control( ...$sidebar_args );
 	}
 }
 /**
 * Callback to sort array by a 'name' key.
 	echo '<div id="' . esc_attr( $sidebar ) . '" class="widgets-sortables">';
 	if ( $sidebar_name ) {
 		$add_to = sprintf(
-			/* translators: %s: widgets sidebar name. */
+			/* translators: %s: Widgets sidebar name. */
 			__( 'Add to: %s' ),
 			$sidebar_name
 		);
 		?>
 		<div class="sidebar-name" data-add-to="<?php echo esc_attr( $add_to ); ?>">
 *
 * @since 2.5.0
 *
 * @global array $wp_registered_widgets
 *
-* @staticvar int $i
-*
 * @param array $params
 * @return array
 */
 function wp_list_widget_controls_dynamic_sidebar( $params ) {
 	global $wp_registered_widgets;
 	$id        = isset( $params[0]['_temp_id'] ) ? $params[0]['_temp_id'] : $widget_id;
 	$hidden    = isset( $params[0]['_hide'] ) ? ' style="display:none;"' : '';
 	$params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
 	$params[0]['after_widget']  = '</div>';
-	$params[0]['before_title']  = '%BEG_OF_TITLE%'; // deprecated
+	$params[0]['before_title']  = '%BEG_OF_TITLE%'; // Deprecated.
-	$params[0]['after_title']   = '%END_OF_TITLE%'; // deprecated
+	$params[0]['after_title']   = '%END_OF_TITLE%'; // Deprecated.
 	if ( is_callable( $wp_registered_widgets[ $widget_id ]['callback'] ) ) {
 		$wp_registered_widgets[ $widget_id ]['_callback'] = $wp_registered_widgets[ $widget_id ]['callback'];
 		$wp_registered_widgets[ $widget_id ]['callback']  = 'wp_widget_control';
 	}
 function wp_widget_control( $sidebar_args ) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets;
 	$widget_id  = $sidebar_args['widget_id'];
 	$sidebar_id = isset( $sidebar_args['id'] ) ? $sidebar_args['id'] : false;
-	$key        = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ] ) : '-1'; // position of widget in sidebar
+	$key        = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ], true ) : '-1'; // Position of widget in sidebar.
 	$control    = isset( $wp_registered_widget_controls[ $widget_id ] ) ? $wp_registered_widget_controls[ $widget_id ] : array();
 	$widget     = $wp_registered_widgets[ $widget_id ];
 	$id_format     = $widget['id'];
 	$widget_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
 	/*
 	 * We aren't showing a widget control, we're outputting a template
 	 * for a multi-widget control.
 	 */
-	if ( isset( $sidebar_args['_display'] ) && 'template' == $sidebar_args['_display'] && $widget_number ) {
+	if ( isset( $sidebar_args['_display'] ) && 'template' === $sidebar_args['_display'] && $widget_number ) {
-		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
+		// number == -1 implies a template where id numbers are replaced by a generic '__i__'.
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
 		if ( isset( $control['id_base'] ) ) {
 			$id_format = $control['id_base'] . '-__i__';
 		}
 	echo $sidebar_args['before_widget'];
 	?>
 	<div class="widget-top">
 	<div class="widget-title-action">
 		<button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
-			<span class="screen-reader-text edit"><?php printf( __( 'Edit widget: %s' ), $widget_title ); ?></span>
+			<span class="screen-reader-text edit">
-			<span class="screen-reader-text add"><?php printf( __( 'Add widget: %s' ), $widget_title ); ?></span>
+				<?php
+				/* translators: %s: Widget title. */
+				printf( __( 'Edit widget: %s' ), $widget_title );
+				?>
+			</span>
+			<span class="screen-reader-text add">
+				<?php
+				/* translators: %s: Widget title. */
+				printf( __( 'Add widget: %s' ), $widget_title );
+				?>
+			</span>
 			<span class="toggle-indicator" aria-hidden="true"></span>
 		</button>
 		<a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
 			<span class="edit"><?php _ex( 'Edit', 'widget' ); ?></span>
 			<span class="add"><?php _ex( 'Add', 'widget' ); ?></span>
 	</div>
 	<?php echo $after_form; ?>
 	</div>
 	<div class="widget-description">
-	<?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
+	<?php
+	$widget_description = wp_widget_description( $widget_id );
+	echo ( $widget_description ) ? "$widget_description\n" : "$widget_title\n";
+	?>
 	</div>
 	<?php
 	echo $sidebar_args['after_widget'];
 	return $sidebar_args;

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a