diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js index db7561e62a..4165985e11 100644 --- a/src/wp-admin/js/editor-expand.js +++ b/src/wp-admin/js/editor-expand.js @@ -15,7 +15,7 @@ $visualEditor = $(), $textTop = $( '#ed_toolbar' ), $textEditor = $( '#content' ), - $textEditorClone = $( '
' ), + $textEditorClone = $( '
' ), $bottom = $( '#post-status-info' ), $menuBar = $(), $statusBar = $(), diff --git a/src/wp-includes/js/wp-emoji.js b/src/wp-includes/js/wp-emoji.js index eed3fe389e..d925496aa4 100644 --- a/src/wp-includes/js/wp-emoji.js +++ b/src/wp-includes/js/wp-emoji.js @@ -70,7 +70,11 @@ node = node.parentNode; } - if ( node && node.nodeType === 1 && test( node.textContent ) ) { + if ( ! node || ( node.className && node.className.indexOf( 'wp-no-emoji' ) !== -1 ) ) { + continue; + } + + if ( node.nodeType === 1 && test( node.textContent ) ) { parse( node ); } }