Merge branch '3.6' into 3

This commit is contained in:
Daniel Hensby 2017-07-03 16:44:20 +01:00
commit 41b8df0ec7
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -927,6 +927,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
true, true,
$childrenMethod, $childrenMethod,
$numChildrenMethod, $numChildrenMethod,
true,
$nodeCountThreshold, $nodeCountThreshold,
$nodeCountCallback $nodeCountCallback
); );