Skip to content
Snippets Groups Projects
Commit 0daf441f authored by Claudiu Cristea's avatar Claudiu Cristea Committed by Manuel Adán
Browse files

Issue #3322626 by claudiu.cristea, manuel.adan: Drupal 10 compatibility

parent 511a8e29
No related branches found
No related tags found
1 merge request!5D10 compatibility
......@@ -3,5 +3,4 @@ type: module
description: 'Email confirmation service. Provides a common API for email address confirmation.'
package: Mail
configure: email_confirmer.settings
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^8 || ^9 || ^10
......@@ -36,6 +36,7 @@ function email_confirmer_cron() {
->getStorage('email_confirmer_confirmation');
$old_confirmations = $confirmation_storage->getQuery()
->condition('created', \Drupal::time()->getRequestTime() - $lifetime, '<')
->accessCheck(FALSE)
->execute();
if (!empty($old_confirmations)) {
......
......@@ -3,7 +3,6 @@ type: module
description: 'User email confirmation on related events like user email change.'
package: Mail
configure: email_confirmer_user.settings
core: 8.x
core_version_requirement: ^8 || ^9
core_version_requirement: ^8 || ^9 || ^10
dependencies:
- email_confirmer:email_confirmer
......@@ -9,7 +9,6 @@ use Drupal\Core\Entity\EntityInterface;
use Drupal\email_confirmer\EmailConfirmationInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
use Drupal\Component\Utility\Unicode;
/**
* Implements hook_ENTITY_TYPE_presave().
......@@ -65,7 +64,7 @@ function email_confirmer_user_user_presave(EntityInterface $entity) {
if ($config['notify_current']) {
\Drupal::service('plugin.manager.mail')->mail('email_confirmer_user',
'notify_current',
(mb_substr(PHP_OS, 0, 3) == 'WIN') ? $old_email : '"' . addslashes(Unicode::mimeHeaderEncode(\Drupal::config('system.site')->get('name'))) . '" <' . $old_email . '>',
$old_email,
\Drupal::languageManager()->getDefaultLanguage()->getId(),
['context' => ['email_confirmer_confirmation' => $confirmation, 'user' => $entity]]);
}
......
......@@ -114,6 +114,7 @@ class EmailConfirmerManager implements EmailConfirmerManagerInterface {
$old_confirmations = $confirmation_query
->condition('email', $email)
->accessCheck()
->sort('created', 'DESC')
->execute();
......
......@@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\email_confirmer\InvalidConfirmationStateException;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Url;
/**
......@@ -260,7 +259,7 @@ class EmailConfirmation extends ContentEntityBase implements EmailConfirmationIn
// Send the confirmation request.
$message = \Drupal::service('plugin.manager.mail')->mail('email_confirmer',
'confirmation_request',
(mb_substr(PHP_OS, 0, 3) == 'WIN') ? $this->getEmail() : '"' . addslashes(Unicode::mimeHeaderEncode(\Drupal::config('system.site')->get('name'))) . '" <' . $this->getEmail() . '>',
$this->getEmail(),
$this->language(),
['context' => ['email_confirmer_confirmation' => $this]]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment