According to the token_replace() function documentation, the $options array parameter can include:
clear: A boolean flag indicating that tokens should be removed from the final text if no replacement value can be generated.
However, there is nothing that actually does this.
echo token_replace('mystring/[invalid:token]', array(), array('clean' => TRUE));
Expected: mystring/
Actual: mystring/[invalid:token]
| Comment | File | Size | Author |
|---|---|---|---|
| #14 | 681782-token-clean-D7.patch | 3.22 KB | dave reid |
| #8 | 681782-token-clean-D7.patch | 3.57 KB | dave reid |
| #4 | 681782-token-clean-D7.patch | 2.58 KB | dave reid |
| #2 | 681782-token-clean-D7.patch | 2.95 KB | dave reid |
| #1 | 681782-token-clean-D7.patch | 670 bytes | dave reid |
Comments
Comment #1
dave reidComment #2
dave reidWith tests this time.
Comment #3
dave reid#2: 681782-token-clean-D7.patch queued for re-testing.
Comment #4
dave reidRe-rolled for HEAD.
Comment #5
dave reidTagging core issues that will help pathauto in core/D7.
Comment #6
mcarbone commentedLooks good and works fine on my local install, although for clarity the message returned by the two assertFalse's (with 'clear' and without) should probably be different and not both "Basic placeholder tokens replaced." Also, I know that this patch doesn't introduce this, but it's weird that the second assertFalse with "Basic placeholder tokens replaced." appears below that comment block talking about the sanitization tests.
Comment #7
dave reidSanitization is different from the 'clear'. The former is making sure there's no XSS in tokens, the latter is making sure we get rid of invalid, non-replaceable tokens. I'll revise the inline comments shortly.
Comment #8
dave reidRevised in-line comments and test assertion messages. How's this one look mcarbone?
Comment #10
dave reid#8: 681782-token-clean-D7.patch queued for re-testing.
Comment #12
dave reidComment #13
mcarbone commentedFixes look good to me but patch doesn't apply cleanly:
Comment #14
dave reidHere, give this a try.
Comment #15
mcarbone commentedApplies cleanly, works well, looks ready to go.
Comment #16
s3ndal3 commented#2: 681782-token-clean-D7.patch queued for re-testing.
Comment #17
s3ndal3 commented#1: 681782-token-clean-D7.patch queued for re-testing.
Comment #18
dries commentedCommitted to CVS HEAD. Thanks.