From dd03a5a156b495298656856152272a3cbf2f807b Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 4 Sep 2020 21:48:07 +0000
Subject: [PATCH] Docs: Further correct placement for `wp_editor_expand` filter
 DocBlock.

This ensures that the filter is only applied if the conditions before it are evaluated to true.

Follow-up to [48714].

Props johnbillion.
See #50768.
Built from https://develop.svn.wordpress.org/trunk@48942


git-svn-id: http://core.svn.wordpress.org/trunk@48704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-advanced.php | 30 ++++++++++++++----------------
 wp-includes/version.php         |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 993856d927..0152631617 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -44,26 +44,24 @@ wp_enqueue_script( 'post' );
 $_wp_editor_expand   = false;
 $_content_editor_dfw = false;
 
-/**
- * Filters whether to enable the 'expand' functionality in the post editor.
- *
- * @since 4.0.0
- * @since 4.1.0 Added the `$post_type` parameter.
- *
- * @param bool   $expand    Whether to enable the 'expand' functionality. Default true.
- * @param string $post_type Post type.
- */
-$_wp_editor_expand_enabled = apply_filters( 'wp_editor_expand', true, $post_type );
-
 if ( post_type_supports( $post_type, 'editor' )
 	&& ! wp_is_mobile()
 	&& ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) )
-	&& $_wp_editor_expand_enabled
 ) {
-
-	wp_enqueue_script( 'editor-expand' );
-	$_content_editor_dfw = true;
-	$_wp_editor_expand   = ( 'on' === get_user_setting( 'editor_expand', 'on' ) );
+	/**
+	 * Filters whether to enable the 'expand' functionality in the post editor.
+	 *
+	 * @since 4.0.0
+	 * @since 4.1.0 Added the `$post_type` parameter.
+	 *
+	 * @param bool   $expand    Whether to enable the 'expand' functionality. Default true.
+	 * @param string $post_type Post type.
+	 */
+	if ( apply_filters( 'wp_editor_expand', true, $post_type ) ) {
+		wp_enqueue_script( 'editor-expand' );
+		$_content_editor_dfw = true;
+		$_wp_editor_expand   = ( 'on' === get_user_setting( 'editor_expand', 'on' ) );
+	}
 }
 
 if ( wp_is_mobile() ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1c42756f16..fae537b1c2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48941';
+$wp_version = '5.6-alpha-48942';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.