Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API Update code to reflect changes in silverstripe/cms #652

Closed
wants to merge 1 commit into from
Closed

API Update code to reflect changes in silverstripe/cms #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions src/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
use SilverStripe\Security\InheritedPermissionsExtension;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\PermissionCheckable;
use SilverStripe\Security\PermissionChecker;
use SilverStripe\Security\PermissionProvider;
use SilverStripe\Security\Security;
Expand Down Expand Up @@ -99,7 +100,7 @@
* @method Member Owner()
* @method File Parent()
*/
class File extends DataObject implements AssetContainer, Thumbnail, CMSPreviewable, PermissionProvider, Resettable
class File extends DataObject implements AssetContainer, Thumbnail, CMSPreviewable, PermissionProvider, Resettable, PermissionCheckable
{
use ImageManipulation;

Expand Down Expand Up @@ -351,14 +352,6 @@ public function AbsoluteLink()
return $this->getAbsoluteURL();
}

/**
* @return string
*/
public function getTreeTitle()
{
return Convert::raw2xml($this->Title);
}

/**
* @param Member $member
* @return bool
Expand Down Expand Up @@ -1435,10 +1428,7 @@ public function PreviewLink($action = null)
return $link;
}

/**
* @return PermissionChecker
*/
public function getPermissionChecker()
public function getPermissionChecker(): PermissionChecker
{
return Injector::inst()->get(PermissionChecker::class.'.file');
}
Expand Down Expand Up @@ -1518,13 +1508,12 @@ protected function filterFilename($name)
}, $parts ?? []));
}

public function flushCache($persistent = true): static
public function flushCache(bool $persistent = true): static
{
parent::flushCache($persistent);
static::reset();
ImageShortcodeProvider::flush();
FileShortcodeProvider::flush();
return $this;
return parent::flushCache($persistent);
}

public static function reset()
Expand Down
Loading