2.3.25

README.md

@@ -127,6 +127,9 @@ grunt
 - Disable some or all of the default Genesis theme option meta boxes (template, some disabled by default)
 
 ## Changelog
+### 2.3.25 (January 14, 2016)
+- Turn off TinyMCE's auto-expand
+
 ### 2.3.24 (January 2, 2016)
 - Fix `Colors` partial reference
 

includes/admin/admin-views.php

@@ -145,13 +145,16 @@ function bfg_add_editor_style() {
 /**
  * Modifies the TinyMCE settings array.
  *
+ * See: https://core.trac.wordpress.org/ticket/29360
+ *
  * @since 2.0.0
  */
 function bfg_tiny_mce_before_init( $options ) {
 
-	$options['element_format'] = 'html'; // See: http://www.tinymce.com/wiki.php/Configuration:element_format
-	$options['schema']         = 'html5-strict'; // Only allow the elements that are in the current HTML5 specification. See: http://www.tinymce.com/wiki.php/Configuration:schema
-	$options['block_formats']  = 'Paragraph=p;Header 2=h2;Header 3=h3;Header 4=h4;Blockquote=blockquote'; // Restrict the block formats available in TinyMCE. See: http://www.tinymce.com/wiki.php/Configuration:block_formats
+	$options['element_format']   = 'html'; // See: http://www.tinymce.com/wiki.php/Configuration:element_format
+	$options['schema']           = 'html5-strict'; // Only allow the elements that are in the current HTML5 specification. See: http://www.tinymce.com/wiki.php/Configuration:schema
+	$options['block_formats']    = 'Paragraph=p;Header 2=h2;Header 3=h3;Header 4=h4;Blockquote=blockquote'; // Restrict the block formats available in TinyMCE. See: http://www.tinymce.com/wiki.php/Configuration:block_formats
+	$options['wp_autoresize_on'] = false;
 
 	return $options;