Merge branch '3.6' into 3

This commit is contained in:
Steve Boyd 2021-05-03 14:29:08 +12:00
commit f09a1e2d09
2 changed files with 5 additions and 0 deletions

View File

@ -120,6 +120,8 @@ class Blog extends Page implements PermissionProvider
]; ];
/** /**
* The ProvideComments db column is defined in the silverstripe/comments module
*
* @var array * @var array
*/ */
private static $defaults = [ private static $defaults = [

View File

@ -103,6 +103,9 @@ class BlogPost extends Page
]; ];
/** /**
* The ProvideComments db column is defined in the silverstripe/comments module
* The InheritSideBar db column is defined in the silverstripe/widgets module
*
* @var array * @var array
*/ */
private static $defaults = [ private static $defaults = [