enmi-conf.org: comparison wp/wp-includes/class-wp-customize-manager.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 					$settings = get_option( "widget_{$id_base}", array() );
 					if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
 						$settings = $settings->getArrayCopy();
 					}
+					unset( $settings['_multiwidget'] );
 					// Find the max widget number for this type.
 					$widget_numbers = array_keys( $settings );
 					if ( count( $widget_numbers ) > 0 ) {
 						$widget_numbers[]               = 1;
 						$max_widget_numbers[ $id_base ] = max( ...$widget_numbers );
 					! in_array( $setting_id, $reused_nav_menu_setting_ids, true )
 					&&
 					preg_match( '#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches )
 				);
 				if ( $can_reuse ) {
-					$nav_menu_term_id              = intval( $matches['nav_menu_id'] );
+					$nav_menu_term_id              = (int) $matches['nav_menu_id'];
 					$nav_menu_setting_id           = $setting_id;
 					$reused_nav_menu_setting_ids[] = $setting_id;
 					break;
 				}
 			}
 		 */
 		if ( ! headers_sent() ) {
 			nocache_headers();
 			header( 'X-Robots: noindex, nofollow, noarchive' );
 		}
-		add_action( 'wp_head', 'wp_no_robots' );
+		add_filter( 'wp_robots', 'wp_robots_no_robots' );
 		add_filter( 'wp_headers', array( $this, 'filter_iframe_security_headers' ) );
 		/*
 		 * If preview is being served inside the customizer preview iframe, and
 		 * if the user doesn't have customize capability, then it is assumed
 		 */
 		do_action( 'customize_preview_init', $this );
 	}
 	/**
-	 * Filter the X-Frame-Options and Content-Security-Policy headers to ensure frontend can load in customizer.
+	 * Filters the X-Frame-Options and Content-Security-Policy headers to ensure frontend can load in customizer.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param array $headers Headers.
 	 * @return array Headers.
 	public function prepare_setting_validity_for_js( $validity ) {
 		if ( is_wp_error( $validity ) ) {
 			$notification = array();
 			foreach ( $validity->errors as $error_code => $error_messages ) {
 				$notification[ $error_code ] = array(
-					'message' => join( ' ', $error_messages ),
+					'message' => implode( ' ', $error_messages ),
 					'data'    => $validity->get_error_data( $error_code ),
 				);
 			}
 			return $notification;
 		} else {
 		do_action( 'save_post', $post->ID, $post, true );
 		/** This action is documented in wp-includes/post.php */
 		do_action( 'wp_insert_post', $post->ID, $post, true );
+		wp_after_insert_post( get_post( $post_id ), true, $post );
 		wp_trash_post_comments( $post_id );
 		/** This action is documented in wp-includes/post.php */
 		do_action( 'trashed_post', $post_id );
 		}
 		$lock = get_post_meta( $changeset_post_id, '_edit_lock', true );
 		$lock = explode( ':', $lock );
 		if ( $lock && ! empty( $lock[1] ) ) {
-			$user_id         = intval( $lock[1] );
+			$user_id         = (int) $lock[1];
 			$current_user_id = get_current_user_id();
 			if ( $user_id === $current_user_id ) {
 				$lock = sprintf( '%s:%s', time(), $user_id );
 				update_post_meta( $changeset_post_id, '_edit_lock', $lock );
 			}
 		}
 	}
 	/**
-	 * Filter heartbeat settings for the Customizer.
+	 * Filters heartbeat settings for the Customizer.
 	 *
 	 * @since 4.9.0
 	 * @param array $settings Current settings to filter.
 	 * @return array Heartbeat settings.
 	 */
 	 * @param string $id Panel ID to remove.
 	 */
 	public function remove_panel( $id ) {
 		// Removing core components this way is _doing_it_wrong().
 		if ( in_array( $id, $this->components, true ) ) {
-			$message = sprintf(
+			_doing_it_wrong(
-				/* translators: 1: Panel ID, 2: Link to 'customize_loaded_components' filter reference. */
+				__METHOD__,
-				__( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
-				$id,
 				sprintf(
-					'<a href="%1$s">%2$s</a>',
+					/* translators: 1: Panel ID, 2: Link to 'customize_loaded_components' filter reference. */
-					esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ),
+					__( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
-					'<code>customize_loaded_components</code>'
+					$id,
-				)
+					sprintf(
+						'<a href="%1$s">%2$s</a>',
+						esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ),
+						'<code>customize_loaded_components</code>'
+					)
+				),
+				'4.5.0'
 			);
-			_doing_it_wrong( __METHOD__, $message, '4.5.0' );
 		}
 		unset( $this->panels[ $id ] );
 	}
 	/**
 		</script>
 		<script type="text/html" id="tmpl-customize-changeset-locked-notification">
 			<li class="notice notice-{{ data.type || 'info' }} {{ data.containerClasses || '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
 				<div class="notification-message customize-changeset-locked-message">
-					<img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}">
+					<img class="customize-changeset-locked-avatar" src="{{ data.lockUser.avatar }}" alt="{{ data.lockUser.name }}" />
 					<p class="currently-editing">
 						<# if ( data.message ) { #>
 							{{{ data.message }}}
 						<# } else if ( data.allowOverride ) { #>
 							<?php

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4