Merge pull request #1983 from kinglozzer/fr-7420-page-icons

Fix: TreeDropdownField showing broken page icons (fixes silverstripe/framework#7420)
This commit is contained in:
Damian Mooyman 2017-10-05 13:48:25 +13:00 committed by GitHub
commit a0a5979eb6

View File

@ -2830,7 +2830,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
$flags = $this->getStatusFlags(); $flags = $this->getStatusFlags();
$treeTitle = sprintf( $treeTitle = sprintf(
"<span class=\"jstree-pageicon page-icon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>", "<span class=\"jstree-pageicon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
Convert::raw2htmlid($this->class), Convert::raw2htmlid($this->class),
Convert::raw2att(Convert::raw2json($children)), Convert::raw2att(Convert::raw2json($children)),
Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle)) Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle))