mirror of
https://github.com/silverstripe/silverstripe-blog
synced 2024-10-22 11:05:58 +02:00
Merge branch '3.6' into 3
This commit is contained in:
commit
f09a1e2d09
@ -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 = [
|
||||||
|
@ -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 = [
|
||||||
|
Loading…
Reference in New Issue
Block a user