tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUG Fix HTTP url rewriting

This commit is contained in:
Damian Mooyman 2016-06-03 20:36:02 +12:00
parent 749d28a3c9
commit a0213aa2bf
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control/HTTP.php
View File

@ -104,7 +104,7 @@ class HTTP {
* @param string|callable $code Either a string that can evaluate to an expression to rewrite links
* (depreciated), or a callable that takes a single parameter and returns the rewritten URL.
*
* @return The content with all links rewritten as per the logic specified in $code.
* @return string The content with all links rewritten as per the logic specified in $code.
*/
public static function urlRewriter($content, $code) {
if(!is_callable($code)) {
@ -132,14 +132,15 @@ class HTTP {
// Callback for regexp replacement
$callback = function($matches) use($code) {
// Decode HTML attribute
$URL = Convert::xml2raw($matches[2]);
if(is_callable($code)) {
$rewritten = $code($matches[2]);
$rewritten = $code($URL);
} else {
// Expose the $URL variable to be used by the $code expression
$URL = $matches[2];
$rewritten = eval("return ($code);");
}
return $matches[1] . $rewritten . $matches[3];
return $matches[1] . Convert::raw2xml($rewritten) . $matches[3];
};
// Execute each expression

6
tests/control/HTTPTest.php
View File

@ -278,6 +278,12 @@ class HTTPTest extends FunctionalTest {
'<link href=http://www.silverstripe.org/base.css />',
HTTP::absoluteURLs('<link href=base.css />')
);
// Test special characters are retained
$test->assertEquals(
'<a href="http://www.silverstripe.org/Security/changepassword?m=3&amp;t=7214fdfde">password reset link</a>',
HTTP::absoluteURLs('<a href="/Security/changepassword?m=3&amp;t=7214fdfde">password reset link</a>')
);
});
}