Merge branch '3.2' into 3
This commit is contained in:
commit
3d8d3ec28c
|
@ -23,7 +23,7 @@ class CachedContentFilter extends ContentFilter
|
|||
$cache = $this->getCache();
|
||||
|
||||
// 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)
|
||||
? null
|
||||
: $cache->get($key);
|
||||
|
|
|
@ -206,7 +206,7 @@ class VersionFeed extends SiteTreeExtension
|
|||
|
||||
public function getSiteRSSLink()
|
||||
{
|
||||
if (Config::inst()->get(get_class(), 'allchanges_enabled')
|
||||
if (Config::inst()->get(self::class, 'allchanges_enabled')
|
||||
&& SiteConfig::current_site_config()->AllChangesEnabled
|
||||
) {
|
||||
return $this->owner->Link('allchanges');
|
||||
|
@ -215,7 +215,7 @@ class VersionFeed extends SiteTreeExtension
|
|||
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue