Changeset 48942 for trunk/src/wp-admin/edit-form-advanced.php

Timestamp:

09/04/2020 09:46:11 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/edit-form-advanced.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -45 +45 @@
 $_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' ) );
+    }
 }