mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-04 15:18:39 +02:00
merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45249 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
1ebefd7eff
commit
378fc8a4ab
@ -409,6 +409,10 @@ class ViewableData extends Object implements Iterator {
|
||||
if(!$castedClass || $castedClass == 'HTMLText' || $castedClass == 'HTMLVarchar' || $castedClass == 'Text') {
|
||||
// Case 2: the value is already XML-safe, just return it
|
||||
|
||||
// This replacement is needed to get hash-links working. It's currently being done by Text::AbsoluteLinks()
|
||||
// This is used in the inform template, but not necessarily elsewhere.
|
||||
//$val = str_replace('$CurrentPageURL', $_SERVER['REQUEST_URI'], $val);
|
||||
|
||||
} else {
|
||||
// Case 3: the value is raw and must be made XML-safe
|
||||
$val = Convert::raw2xml($val);
|
||||
|
Loading…
Reference in New Issue
Block a user