Skip to content

Commit

Permalink
Docs: Further correct placement for wp_editor_expand filter DocBlock.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
SergeyBiryukov committed Sep 4, 2020
1 parent d0a32c5 commit dd03a5a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
30 changes: 14 additions & 16 deletions wp-admin/edit-form-advanced.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,24 @@
$_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() ) {
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit dd03a5a

Please sign in to comment.