From c4145b769e3a263c1f367a59ac9cfb203843dd77 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 28 Oct 2016 20:06:02 +0000 Subject: [PATCH] TinyMCE: if the current editor configuration is without toolbars, prevent errors when adding the labels for custom shortcuts. Fixes #38063. git-svn-id: https://develop.svn.wordpress.org/trunk@38997 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js index beaddf945f..8209ba4109 100644 --- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -549,7 +549,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }); } - if ( editor.settings.wp_shortcut_labels ) { + if ( editor.settings.wp_shortcut_labels && editor.theme.panel ) { var labels = {}; var access = 'Shift+Alt+'; var meta = 'Ctrl+';