Fix passing of linting options

WordPress · Sep 12, 2017 · 02116b2 · 02116b2
1 parent b6092bb
commit 02116b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wp-admin/js/code-editor.js b/wp-admin/js/code-editor.js
@@ -61,17 +61,17 @@ if ( 'undefined' === typeof window.wp.codeEditor ) {
 		}
 
 		// Configure JSHint.
-		if ( 'javascript' === lintOptions.mode && settings.jshint ) {
+		if ( 'javascript' === settings.codemirror.mode && settings.jshint ) {
 			$.extend( lintOptions.options, settings.jshint );
 		}
 
 		// Configure CSSLint.
-		if ( 'css' === lintOptions.mode && settings.csslint ) {
+		if ( 'css' === settings.codemirror.mode && settings.csslint ) {
 			$.extend( lintOptions.options, settings.csslint );
 		}
 
 		// Configure HTMLHint.
-		if ( 'htmlmixed' === lintOptions.mode && settings.htmlhint ) {
+		if ( 'htmlmixed' === settings.codemirror.mode && settings.htmlhint ) {
 			lintOptions.options.rules = $.extend( {}, settings.htmlhint );
 
 			if ( settings.jshint ) {

diff --git a/wp-includes/general-template-addendum.php b/wp-includes/general-template-addendum.php
@@ -218,7 +218,7 @@ function wp_enqueue_code_editor( $args ) {
 		) );
 
 		if ( ! current_user_can( 'unfiltered_html' ) ) {
-			$settings['htmlhint']['rules']['kses'] = wp_kses_allowed_html( 'post' );
+			$settings['htmlhint']['kses'] = wp_kses_allowed_html( 'post' );
 		}
 	} elseif ( 'text/x-gfm' === $type ) {
 		$settings['codemirror'] = array_merge( $settings['codemirror'], array(