Changeset 29653

Timestamp:

08/29/2014 02:27:06 AM (12 years ago)

Author:

azaozz

Message:

Editor expand: add a filter to turn it off from PHP, fixes #29423

File:

• trunk/src/wp-admin/edit-form-advanced.php (modified) (3 diffs)

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

@@ -12 +12 @@
 
 wp_enqueue_script('post');
+$_wp_editor_expand = false;
 
 if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
-     ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) ) {
+     ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
+     apply_filters( 'wp_editor_expand', true ) ) {
 
     wp_enqueue_script('editor-expand');
-    $_wp_autoresize_on = true;
+    $_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
 }
 
@@ -491 +493 @@
 if ( post_type_supports($post_type, 'editor') ) {
 ?>
-<div id="postdivrich" class="postarea<?php if ( get_user_setting( 'editor_expand', 'on' ) === 'on' ) { echo ' wp-editor-expand'; } ?>">
+<div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
 
 <?php wp_editor( $post->post_content, 'content', array(
@@ -500 +502 @@
     'tinymce' => array(
         'resize' => false,
-        'wp_autoresize_on' => ( ! empty( $_wp_autoresize_on ) && get_user_setting( 'editor_expand', 'on' ) === 'on' ),
+        'wp_autoresize_on' => $_wp_editor_expand,
         'add_unload_trigger' => false,
     ),