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.

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

More new-shortcode support #2759

Merged
merged 3 commits into from May 12, 2017
Merged

More new-shortcode support #2759

merged 3 commits into from May 12, 2017

Conversation

@ralsina
Copy link
Member

ralsina commented May 12, 2017

Partial #2752 implementation

@@ -45,7 +46,8 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
"""Compile HTML into HTML strings, with shortcode support."""
if not is_two_file:
_, data = self.split_metadata(data)
return self.site.apply_shortcodes(data, with_dependencies=True, extra_context={'post': post})
new_data, shortcodes = sc.extract_shortcodes(data)
return self.site.apply_shortcodes_uuid(new_data, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska May 12, 2017

Member

Why this dict() form instead of {}?

This comment has been minimized.

Copy link
@ralsina

ralsina May 12, 2017

Author Member

copy/paste and the place where I copied it from used that one

ralsina added 2 commits May 12, 2017
@ralsina ralsina merged commit 4f1f5f7 into master May 12, 2017
4 of 5 checks passed
4 of 5 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
codacy/pr Good work! A positive pull request.
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@ralsina ralsina deleted the use-new-shortcodes branch May 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.