summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2014-12-16 21:17:21 -0800
committerwebchick2014-12-16 21:17:21 -0800
commite15ebedc4c6afdab87c1ffd7cb1f5ca462aafe87 (patch)
treeec47cb2e872589c5b41dccc2ac7755ef2a6569a4
parent1621ae8b76a8e5add381ce5a959fc33a90028dc3 (diff)
Revert "Issue #2196977 by Eric_A, tadityar, Poornima3, jhedstrom: Drupal/filter/Annotation/Filter uses public $module instead of $provider"8.0.0-beta4
Oops. Forgot we're in majors/criticals only mode today. This reverts commit 1621ae8b76a8e5add381ce5a959fc33a90028dc3.
-rw-r--r--core/lib/Drupal/Core/Condition/Annotation/Condition.php4
-rw-r--r--core/modules/filter/src/Entity/FilterFormat.php2
-rw-r--r--core/modules/filter/src/Plugin/FilterBase.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
index 176f373..55834d0 100644
--- a/core/lib/Drupal/Core/Condition/Annotation/Condition.php
+++ b/core/lib/Drupal/Core/Condition/Annotation/Condition.php
@@ -46,11 +46,11 @@ class Condition extends Plugin {
public $label;
/**
- * The name of the provider that owns the filter.
+ * The name of the module providing the type.
*
* @var string
*/
- public $provider;
+ public $module;
/**
* An array of contextual data.
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 4d45323..9c37809 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -99,7 +99,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
* An associative array of filters assigned to the text format, keyed by the
* instance ID of each filter and using the properties:
* - id: The plugin ID of the filter plugin instance.
- * - provider: The name of the provider that owns the filter.
+ * - module: The name of the module providing the filter.
* - status: (optional) A Boolean indicating whether the filter is
* enabled in the text format. Defaults to FALSE.
* - weight: (optional) The weight of the filter in the text format. Defaults
diff --git a/core/modules/filter/src/Plugin/FilterBase.php b/core/modules/filter/src/Plugin/FilterBase.php
index 59a0bb4..b5394b4 100644
--- a/core/modules/filter/src/Plugin/FilterBase.php
+++ b/core/modules/filter/src/Plugin/FilterBase.php
@@ -28,7 +28,7 @@ abstract class FilterBase extends PluginBase implements FilterInterface {
protected $plugin_id;
/**
- * The name of the provider that owns this filter.
+ * The name of the module that owns this filter.
*
* @var string
*/