mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-02 22:28:37 +02:00
BUGFIX: Fixed bug in relation to new ORM(DataObject::get() doesn't return a null anymore)
This commit is contained in:
parent
0de6dbc848
commit
397d19f23b
@ -441,7 +441,7 @@ class Group extends DataObject {
|
|||||||
|
|
||||||
// Add default author group if no other group exists
|
// Add default author group if no other group exists
|
||||||
$allGroups = DataObject::get('Group');
|
$allGroups = DataObject::get('Group');
|
||||||
if(!$allGroups) {
|
if(!$allGroups->count()) {
|
||||||
$authorGroup = new Group();
|
$authorGroup = new Group();
|
||||||
$authorGroup->Code = 'content-authors';
|
$authorGroup->Code = 'content-authors';
|
||||||
$authorGroup->Title = _t('Group.DefaultGroupTitleContentAuthors', 'Content Authors');
|
$authorGroup->Title = _t('Group.DefaultGroupTitleContentAuthors', 'Content Authors');
|
||||||
@ -456,7 +456,7 @@ class Group extends DataObject {
|
|||||||
|
|
||||||
// Add default admin group if none with permission code ADMIN exists
|
// Add default admin group if none with permission code ADMIN exists
|
||||||
$adminGroups = Permission::get_groups_by_permission('ADMIN');
|
$adminGroups = Permission::get_groups_by_permission('ADMIN');
|
||||||
if(!$adminGroups) {
|
if(!$adminGroups->count()) {
|
||||||
$adminGroup = new Group();
|
$adminGroup = new Group();
|
||||||
$adminGroup->Code = 'administrators';
|
$adminGroup->Code = 'administrators';
|
||||||
$adminGroup->Title = _t('Group.DefaultGroupTitleAdministrators', 'Administrators');
|
$adminGroup->Title = _t('Group.DefaultGroupTitleAdministrators', 'Administrators');
|
||||||
|
Loading…
Reference in New Issue
Block a user