Merge pull request #550 from UN-OCHA/develop

Deploy 25-01-23(?)
UN-OCHA · Jan 26, 2023 · 1ad36fd · 1ad36fd
2 parents 11151d0 + 251e8c7
commit 1ad36fd
Show file tree

Hide file tree

Showing 10 changed files with 200 additions and 98 deletions.
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
         "composer/installers": "^1.10",
         "cweagans/composer-patches": "^1.7",
         "drupal-composer/preserve-paths": "^0.1.6",
-        "drupal/admin_denied": "^1.1",
-        "drupal/allowed_formats": "^1.3",
+        "drupal/admin_denied": "^2.0",
+        "drupal/allowed_formats": "^2.0",
         "drupal/components": "^2.4",
         "drupal/config_split": "^2.0.0-rc1",
         "drupal/content_entity_clone": "^1.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -23,6 +23,7 @@ use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\EntityHelper;
 use Drupal\reliefweb_utility\Helpers\MailHelper;
 use Drupal\reliefweb_utility\Helpers\MediaHelper;
+use Drupal\reliefweb_utility\Helpers\ReliefWebStateHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\TextHelper;
 use Drupal\taxonomy\TermInterface;
@@ -654,7 +655,7 @@ function reliefweb_entities_mail($key, array &$message, array $parameters) {
     $message['params']['plain'] = TRUE;
     // Use the submit mailbox as sender and add it also as CC to track the
     // notifications.
-    $submit = \Drupal::state()->get('reliefweb_submit_email');
+    $submit = ReliefWebStateHelper::getSubmitEmail();
     if (!empty($submit)) {
       $message['headers']['From'] = $submit;
       $message['headers']['CC'] = $submit;