Merge branch '2.1'

This commit is contained in:
Robbie Averill 2017-12-08 00:00:25 +13:00
commit b5f9602eb5

View File

@ -39,10 +39,12 @@ class ShortCodeRelationFinder
}
/**
* @param int $number
* @return DataList
*/
public function getList($number)
{
$number = (int) $number;
$list = DataList::create('SiteTree');
$where = array();
$fields = $this->getShortCodeFields('SiteTree');