summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2013-06-04 01:13:48 (GMT)
committerDries2013-06-04 01:13:48 (GMT)
commitf150c849b24e95b879307d8ae35d2634b760390d (patch)
tree8f5c4f60457b116736f78e2f880bc09f33d64a02
parent0756534ae2e2d810c394eab4c05fa96432657ed0 (diff)
Issue #2008644 by mradcliffe, Pancho: Fixed FilterPluginManager::__construct() calls CacheDecorator with incorrect parameters (expires).
-rw-r--r--core/modules/filter/lib/Drupal/filter/FilterPluginManager.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php b/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php
index f313cca..fcf94d8 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php
@@ -9,6 +9,7 @@ namespace Drupal\filter;
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
+use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Language\Language;
use Drupal\Core\Plugin\Discovery\AlterDecorator;
use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
@@ -32,9 +33,9 @@ class FilterPluginManager extends PluginManagerBase {
$annotation_namespaces = array('Drupal\filter\Annotation' => $namespaces['Drupal\filter']);
$this->discovery = new AnnotatedClassDiscovery('Filter', $namespaces, $annotation_namespaces, 'Drupal\filter\Annotation\Filter');
$this->discovery = new AlterDecorator($this->discovery, 'filter_info');
- $this->discovery = new CacheDecorator($this->discovery, 'filter_plugins:' . language(Language::TYPE_INTERFACE)->langcode, 'cache', array(
- 'filter_formats' => TRUE,
- ));
+ $cache_key = 'filter_plugins:' . language(Language::TYPE_INTERFACE)->langcode;
+ $cache_tags = array('filter_formats' => TRUE);
+ $this->discovery = new CacheDecorator($this->discovery, $cache_key, 'cache', CacheBackendInterface::CACHE_PERMANENT, $cache_tags);
}
/**