tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revisions per robbieaverill

This commit is contained in:
Aaron Carlino 2017-12-06 22:03:05 +13:00 committed by Damian Mooyman
parent eecb9f64d3
commit 4857816c9e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Security/InheritedPermissionFlusher.php
View File

@ -42,6 +42,8 @@ class InheritedPermissionFlusher extends DataExtension implements Flushable
/**
* @param CacheFlusher[]
* @throws InvalidArgumentException
* @return $this
*/
public function setServices($services)
{
@ -57,6 +59,8 @@ class InheritedPermissionFlusher extends DataExtension implements Flushable
}
$this->services = $services;
return $this;
}
/**
@ -85,11 +89,7 @@ class InheritedPermissionFlusher extends DataExtension implements Flushable
*/
protected function getMemberIDList()
{
if (!$this->owner) {
return null;
}
if (!$this->owner->exists()) {
if (!$this->owner || !$this->owner->exists()) {
return null;
}

2
tests/php/Security/InheritedPermissionsFlusherTest.php
View File

@ -16,7 +16,7 @@ class InheritedPermissionsFlusherTest extends SapphireTest
{
protected static $fixture_file = 'InheritedPermissionsFlusherTest.yml';
public function setUp()
protected function setUp()
{
parent::setUp();