From 5c536cbb509f600c04ee48671158c9174c52d29f Mon Sep 17 00:00:00 2001
From: Jonathan Hunt <git@huntdesign.co.nz>
Date: Thu, 17 Feb 2022 12:52:30 +1300
Subject: [PATCH] Update Features to 7.x-2.14

---
 .../sites/all/modules/contrib/features/features.export.inc  | 2 +-
 docroot/sites/all/modules/contrib/features/features.info    | 6 +++---
 .../sites/all/modules/contrib/features/tests/features.test  | 6 ++++++
 .../contrib/features/tests/features_test/features_test.info | 6 +++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docroot/sites/all/modules/contrib/features/features.export.inc b/docroot/sites/all/modules/contrib/features/features.export.inc
index fb19de41..760e6d60 100644
--- a/docroot/sites/all/modules/contrib/features/features.export.inc
+++ b/docroot/sites/all/modules/contrib/features/features.export.inc
@@ -894,7 +894,7 @@ function features_get_storage($module_name) {
  * @return string|false
  *   An md5 signature, or FALSE if not found.
  */
-function features_get_signature($state = 'default', $module_name, $component, $reset = FALSE) {
+function features_get_signature($state, $module_name, $component, $reset = FALSE) {
   switch ($state) {
     case 'cache':
       // Load the last known stored signature from the database.
diff --git a/docroot/sites/all/modules/contrib/features/features.info b/docroot/sites/all/modules/contrib/features/features.info
index 61eaf50f..aca088e6 100644
--- a/docroot/sites/all/modules/contrib/features/features.info
+++ b/docroot/sites/all/modules/contrib/features/features.info
@@ -10,8 +10,8 @@ test_dependencies[] = views
 
 configure = admin/structure/features/settings
 
-; Information added by Drupal.org packaging script on 2020-11-20
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.x-2.14"
 core = "7.x"
 project = "features"
-datestamp = "1605854056"
+datestamp = "1645021496"
diff --git a/docroot/sites/all/modules/contrib/features/tests/features.test b/docroot/sites/all/modules/contrib/features/tests/features.test
index aabd7609..17466d2f 100644
--- a/docroot/sites/all/modules/contrib/features/tests/features.test
+++ b/docroot/sites/all/modules/contrib/features/tests/features.test
@@ -191,6 +191,12 @@ class FeaturesUserTestCase extends DrupalWebTestCase {
         $style = image_style_save($style);
         foreach ($style['effects'] as $effect) {
           $effect['data']['width'] = '120';
+          // The image style id needs to be explicitly set on the image effect,
+          // if the effect is not coming from the database already.
+          // See https://www.drupal.org/project/features/issues/3256494.
+          /* @see \image_default_style_save() */
+          /* @see \image_effect_form_submit() */
+          $effect['isid'] = $style['isid'];
           image_effect_save($effect);
         }
         break;
diff --git a/docroot/sites/all/modules/contrib/features/tests/features_test/features_test.info b/docroot/sites/all/modules/contrib/features/tests/features_test/features_test.info
index 55e4c493..f1d97ce3 100644
--- a/docroot/sites/all/modules/contrib/features/tests/features_test/features_test.info
+++ b/docroot/sites/all/modules/contrib/features/tests/features_test/features_test.info
@@ -21,8 +21,8 @@ features[user_permission][] = create features_test content
 features[views_view][] = features_test
 hidden = 1
 
-; Information added by Drupal.org packaging script on 2020-11-20
-version = "7.x-2.13"
+; Information added by Drupal.org packaging script on 2022-02-16
+version = "7.x-2.14"
 core = "7.x"
 project = "features"
-datestamp = "1605854056"
+datestamp = "1645021496"