enmi-conf.org: comparison wp/wp-includes/widgets/class-wp-widget-custom-html.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 	 *
 	 * @since 4.8.1
 	 * @var array
 	 */
 	protected $default_instance = array(
-		'title' => '',
+		'title'   => '',
 		'content' => '',
 	);
 	/**
 	 * Sets up a new Custom HTML widget instance.
 	 *
 	 * @since 4.8.1
 	 */
 	public function __construct() {
-		$widget_ops = array(
+		$widget_ops  = array(
-			'classname' => 'widget_custom_html',
+			'classname'                   => 'widget_custom_html',
-			'description' => __( 'Arbitrary HTML code.' ),
+			'description'                 => __( 'Arbitrary HTML code.' ),
 			'customize_selective_refresh' => true,
 		);
 		$control_ops = array(
-			'width' => 400,
+			'width'  => 400,
 			'height' => 350,
 		);
 		parent::__construct( 'custom_html', __( 'Custom HTML' ), $widget_ops, $control_ops );
 	}
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
 		// Prepare instance data that looks like a normal Text widget.
-		$simulated_text_widget_instance = array_merge( $instance, array(
+		$simulated_text_widget_instance = array_merge(
-			'text' => isset( $instance['content'] ) ? $instance['content'] : '',
+			$instance,
-			'filter' => false, // Because wpautop is not applied.
+			array(
-			'visual' => false, // Because it wasn't created in TinyMCE.
+				'text'   => isset( $instance['content'] ) ? $instance['content'] : '',
-		) );
+				'filter' => false, // Because wpautop is not applied.
+				'visual' => false, // Because it wasn't created in TinyMCE.
+			)
+		);
 		unset( $simulated_text_widget_instance['content'] ); // Was moved to 'text' prop.
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-text.php */
 		$content = apply_filters( 'widget_text', $instance['content'], $simulated_text_widget_instance, $this );
+		// Adds noreferrer and noopener relationships, without duplicating values, to all HTML A elements that have a target.
+		$content = wp_targeted_link_rel( $content );
 		/**
 		 * Filters the content of the Custom HTML widget.
 		 *
 		 * @since 4.8.1
 	 *                            WP_Widget::form().
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = array_merge( $this->default_instance, $old_instance );
+		$instance          = array_merge( $this->default_instance, $old_instance );
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 		if ( current_user_can( 'unfiltered_html' ) ) {
 			$instance['content'] = $new_instance['content'];
 		} else {
 			$instance['content'] = wp_kses_post( $new_instance['content'] );
 	 * Loads the required scripts and styles for the widget control.
 	 *
 	 * @since 4.9.0
 	 */
 	public function enqueue_admin_scripts() {
-		$settings = wp_enqueue_code_editor( array(
+		$settings = wp_enqueue_code_editor(
-			'type' => 'text/html',
+			array(
-			'codemirror' => array(
+				'type'       => 'text/html',
-				'indentUnit' => 2,
+				'codemirror' => array(
-				'tabSize' => 2,
+					'indentUnit' => 2,
-			),
+					'tabSize'    => 2,
-		) );
+				),
+			)
+		);
 		wp_enqueue_script( 'custom-html-widgets' );
 		if ( empty( $settings ) ) {
 			$settings = array(
 				'disabled' => true,
 		$l10n = array(
 			'errorNotice' => array(
 				/* translators: %d: error count */
 				'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
 				/* translators: %d: error count */
-				'plural' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+				'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
 			),
 		);
 		wp_add_inline_script( 'custom-html-widgets', sprintf( 'jQuery.extend( wp.customHtmlWidgets.l10n, %s );', wp_json_encode( $l10n ) ), 'after' );
 	}
 			</p>
 			<?php if ( ! current_user_can( 'unfiltered_html' ) ) : ?>
 				<?php
 				$probably_unsafe_html = array( 'script', 'iframe', 'form', 'input', 'style' );
-				$allowed_html = wp_kses_allowed_html( 'post' );
+				$allowed_html         = wp_kses_allowed_html( 'post' );
-				$disallowed_html = array_diff( $probably_unsafe_html, array_keys( $allowed_html ) );
+				$disallowed_html      = array_diff( $probably_unsafe_html, array_keys( $allowed_html ) );
 				?>
 				<?php if ( ! empty( $disallowed_html ) ) : ?>
 					<# if ( data.codeEditorDisabled ) { #>
 						<p>
 							<?php _e( 'Some HTML tags are not permitted, including:' ); ?>
 	 * @since 4.9.0
 	 */
 	public static function add_help_text() {
 		$screen = get_current_screen();
-		$content = '<p>';
+		$content  = '<p>';
 		$content .= __( 'Use the Custom HTML widget to add arbitrary HTML code to your widget areas.' );
 		$content .= '</p>';
 		if ( 'false' !== wp_get_current_user()->syntax_highlighting ) {
 			$content .= '<p>';
 			$content .= sprintf(
 				/* translators: 1: link to user profile, 2: additional link attributes, 3: accessibility text */
 				__( 'The edit field automatically highlights code syntax. You can disable this in your <a href="%1$s" %2$s>user profile%3$s</a> to work in plain text mode.' ),
 				esc_url( get_edit_profile_url() ),
 				'class="external-link" target="_blank"',
-				sprintf( '<span class="screen-reader-text"> %s</span>',
+				sprintf(
+					'<span class="screen-reader-text"> %s</span>',
 					/* translators: accessibility text */
-					__( '(opens in a new window)' )
+					__( '(opens in a new tab)' )
 				)
 			);
 			$content .= '</p>';
 			$content .= '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>';
 			$content .= '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>';
 			$content .= '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>';
 			$content .= '</ul>';
 		}
-		$screen->add_help_tab( array(
+		$screen->add_help_tab(
-			'id' => 'custom_html_widget',
+			array(
-			'title' => __( 'Custom HTML Widget' ),
+				'id'      => 'custom_html_widget',
-			'content' => $content,
+				'title'   => __( 'Custom HTML Widget' ),
-		) );
+				'content' => $content,
+			)
+		);
 	}
 }

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4