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

move parsing of !!!LANG up one level to add lang classes to <pre> tags #479

Merged
merged 5 commits into from
Jan 31, 2012
Merged

move parsing of !!!LANG up one level to add lang classes to <pre> tags #479

merged 5 commits into from
Jan 31, 2012

Conversation

dominikh
Copy link
Contributor

See #478 for more information

By having moved up the language detection and removing of !!!LANG from
the input source we broke html_syntax_highlight when it was being
called independently, as it wouldn't sanitize input nor have a
fallback language.

We now have to detect the language twice, once for writing the correct
<pre> tag and once to ensure that html_syntax_highlight is working
with sane inputs.
lsegal added a commit that referenced this pull request Jan 31, 2012
@lsegal lsegal merged commit 08ea93a into lsegal:master Jan 31, 2012
lsegal added a commit that referenced this pull request Jan 31, 2012
Backports #478, #479, referencing #467

Conflicts:

	lib/yard/templates/helpers/html_helper.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants