FIX Ensure source_file_comments works without throwing errors #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emteknetnz
requested changes
Nov 17, 2024
| @@ -1309,8 +1309,8 @@ EOC; | |||
| { | |||
| // If this template contains a doctype, put it right after it, | |||
| // if not, put it after the <html> tag to avoid IE glitches | |||
| if (stripos($code ?? '', "<!doctype") !== false) { | |||
| $code = preg_replace('/(<!doctype[^>]*("[^"]")*[^>]*>)/im', "$1\r\n<!-- template $templateName -->", $code ?? ''); | |||
| if (preg_match('/(?<!preg_match\(\'\/)<!doctype/i', $code)) { | |||
There was a problem hiding this comment.
Is this right? The string preg_match is here twice, once as a function call and once as part of the regex
If this is correct, please an inline comment to at least say that it's intentional
There was a problem hiding this comment.
Yes, we're using preg_match to look for a match, and the match we're looking for must not be prepended with preg_match(. I'll add a comment about it
GuySartorelli
force-pushed
the
pulls/1/sourcefile-comments
branch
from
bf71f5a to
d86fb1e
Compare
emteknetnz
approved these changes
Nov 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Base templates now include some regex to check the doctype, so the correct
<base>tag can be used.The code that checks for doctype in
includeDebuggingComments()is (understandably) very naive and didn't account for the new regex. Now it does.Issue
SSViewer.source_file_commentsresults in an error #4