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

Merge branch '3' into 4

This commit is contained in:
github-actions 2024-03-21 11:15:45 +00:00
parent 9c9d5f4e77 3d8d3ec28c
commit 156a450f7f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Filters/CachedContentFilter.php
View File

@ -9,7 +9,7 @@ use SilverStripe\Core\Config\Config;
*/ */
class CachedContentFilter extends ContentFilter class CachedContentFilter extends ContentFilter
{ {
/** /**
* Enable caching * Enable caching
* *
@ -17,20 +17,20 @@ class CachedContentFilter extends ContentFilter
* @var boolean * @var boolean
*/ */
private static $cache_enabled = true; private static $cache_enabled = true;
public function getContent($key, $callback) public function getContent($key, $callback)
{ {
$cache = $this->getCache(); $cache = $this->getCache();
// Return cached value if available // Return cached value if available
$cacheEnabled = Config::inst()->get(get_class(), 'cache_enabled'); $cacheEnabled = Config::inst()->get(self::class, 'cache_enabled');
$result = (isset($_GET['flush']) || !$cacheEnabled) $result = (isset($_GET['flush']) || !$cacheEnabled)
? null ? null
: $cache->get($key); : $cache->get($key);
if ($result) { if ($result) {
return $result; return $result;
} }
// Fallback to generate result // Fallback to generate result
$result = parent::getContent($key, $callback); $result = parent::getContent($key, $callback);
$lifetime = Config::inst()->get(ContentFilter::class, 'cache_lifetime') ?: null; $lifetime = Config::inst()->get(ContentFilter::class, 'cache_lifetime') ?: null;

4
src/VersionFeed.php
View File

@ -206,7 +206,7 @@ class VersionFeed extends SiteTreeExtension
public function getSiteRSSLink() public function getSiteRSSLink()
{ {
if (Config::inst()->get(get_class(), 'allchanges_enabled') if (Config::inst()->get(self::class, 'allchanges_enabled')
&& SiteConfig::current_site_config()->AllChangesEnabled && SiteConfig::current_site_config()->AllChangesEnabled
) { ) {
return $this->owner->Link('allchanges'); return $this->owner->Link('allchanges');
@ -215,7 +215,7 @@ class VersionFeed extends SiteTreeExtension
public function getDefaultRSSLink() public function getDefaultRSSLink()
{ {
if (Config::inst()->get(get_class(), 'changes_enabled') && $this->owner->PublicHistory) { if (Config::inst()->get(self::class, 'changes_enabled') && $this->owner->PublicHistory) {
return $this->owner->Link('changes'); return $this->owner->Link('changes');
} }
} }