tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

API Make CMSMain::getSiteTreeFor() default to null nodeCount (#2029)

Browse Source
This commit is contained in:
Lee Bradley 2017-11-27 21:09:27 +00:00 committed by Damian Mooyman
parent 23771add04
commit 1fedc5fc10
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/Controllers/CMSMain.php
View File

@ -21,6 +21,7 @@ use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
use SilverStripe\Core\Environment; use SilverStripe\Core\Environment;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
@ -52,6 +53,7 @@ use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBHTMLText; use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\HiddenClass; use SilverStripe\ORM\HiddenClass;
use SilverStripe\ORM\Hierarchy;
use SilverStripe\ORM\Hierarchy\MarkedSet; use SilverStripe\ORM\Hierarchy\MarkedSet;
use SilverStripe\ORM\SS_List; use SilverStripe\ORM\SS_List;
use SilverStripe\ORM\ValidationResult; use SilverStripe\ORM\ValidationResult;
@ -462,8 +464,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$childrenMethod = null, $childrenMethod = null,
$numChildrenMethod = null, $numChildrenMethod = null,
$filterFunction = null, $filterFunction = null,
$nodeCountThreshold = 30 $nodeCountThreshold = null
) { ) {
$nodeCountThreshold = is_null($nodeCountThreshold) ? Config::inst()->get($className, 'node_threshold_total') : $nodeCountThreshold;
// Provide better defaults from filter // Provide better defaults from filter
$filter = $this->getSearchFilter(); $filter = $this->getSearchFilter();
if ($filter) { if ($filter) {