Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Block should not render embeds (or shortcodes) #13996

Merged
merged 12 commits into from
May 2, 2019
Merged

Code Block should not render embeds (or shortcodes) #13996

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
938c9e0
Fixes 13927.
Feb 21, 2019
cb646e4
Preventing isolated URLs from becoming an embed in Code blocks.
Feb 21, 2019
6b2136e
Refactored code to make it more clear. Escaping forward slashes in is…
Feb 21, 2019
68e78db
Using lodash's `flow` to combine the transformations applied to the c…
Feb 22, 2019
4f97f2c
Modified regexp to escape isolated URLs so that it matches the one us…
Feb 22, 2019
d11537f
Documented helper functions
Feb 22, 2019
0ab5cbe
Fixed reference in comment
Mar 29, 2019
f472fe0
Merge branch 'master' into fix/13927
Mar 29, 2019
c2a352c
Escaping (and unescaping) shortcode and link characters 'dynamically'…
Mar 29, 2019
d86123a
Fixed a typo in a substitution regexp
Apr 16, 2019
1cb6ff8
Added unit tests for the escape and unescape functions in core/code b…
Apr 26, 2019
03e618d
Renamed test file to match standards
Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion packages/block-library/src/code/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
import { __ } from '@wordpress/i18n';
import { createBlock } from '@wordpress/blocks';
import { compose } from '@wordpress/compose';
davilera marked this conversation as resolved.
Show resolved Hide resolved
import {
Path,
SVG,
Expand Down Expand Up @@ -68,6 +69,24 @@ export const settings = {
edit,

save( { attributes } ) {
return <pre><code>{ attributes.content }</code></pre>;
const content = compose(
escapeOpeningSquareBrackets,
escapeProtocolInIsolatedUrls
)( escapeAmpersands( attributes.content || '' ) );
davilera marked this conversation as resolved.
Show resolved Hide resolved
return <pre><code>{ content }</code></pre>;
},
};

function escapeAmpersands( content ) {
return content.replace( /&/g, '&amp;' );
}

function escapeOpeningSquareBrackets( content ) {
// This replicates the escaping of HTML tags, where
// a tag like <strong> becomes &lt;strong>
return content.replace( /\[/g, '&#91;' );
}

function escapeProtocolInIsolatedUrls( content ) {
return content.replace( /(^[^.]^https?:)\/\/([^\s]+$[^.]$)/m, '$1&#47;&#47;$2' );
davilera marked this conversation as resolved.
Show resolved Hide resolved
}