mirror of
https://github.com/silverstripe/silverstripe-dms
synced 2024-09-28 12:26:14 +02:00
FIX Escape class and field name when looking up shortcode fields for SiteTree
This commit is contained in:
parent
82a8a4b142
commit
dbad64939a
@ -39,16 +39,20 @@ class ShortCodeRelationFinder
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param int $number
|
||||||
* @return DataList
|
* @return DataList
|
||||||
*/
|
*/
|
||||||
public function getList($number)
|
public function getList($number)
|
||||||
{
|
{
|
||||||
|
$number = (int) $number;
|
||||||
$list = DataList::create('SiteTree');
|
$list = DataList::create('SiteTree');
|
||||||
$where = array();
|
$where = array();
|
||||||
$fields = $this->getShortCodeFields('SiteTree');
|
$fields = $this->getShortCodeFields('SiteTree');
|
||||||
$shortcode = DMS::inst()->getShortcodeHandlerKey();
|
$shortcode = DMS::inst()->getShortcodeHandlerKey();
|
||||||
foreach ($fields as $ancClass => $ancFields) {
|
foreach ($fields as $ancClass => $ancFields) {
|
||||||
|
$ancClass = Convert::raw2sql($ancClass);
|
||||||
foreach ($ancFields as $ancFieldName => $ancFieldSpec) {
|
foreach ($ancFields as $ancFieldName => $ancFieldSpec) {
|
||||||
|
$ancFieldName = Convert::raw2sql($ancFieldName);
|
||||||
if ($ancClass != "SiteTree") {
|
if ($ancClass != "SiteTree") {
|
||||||
$list = $list->leftJoin($ancClass, '"' . $ancClass . '"."ID" = "SiteTree"."ID"');
|
$list = $list->leftJoin($ancClass, '"' . $ancClass . '"."ID" = "SiteTree"."ID"');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user