Verified Commit 649d602c authored by Jess's avatar Jess
Browse files

Merged 9.3.12.

parents 467d4fd1 aa750f98

composer.lock

+1 −1
Original line number Diff line number Diff line
@@ -7993,5 +7993,5 @@ 
    "platform-overrides": {

        "php": "7.3.0"

    },

    "plugin-api-version": "2.2.0"

    "plugin-api-version": "2.3.0"

}

core/lib/Drupal/Core/Form/FormBuilder.php

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ protected function handleInputElement($form_id, &$element, FormStateInterface &$ 
    // #access=FALSE on an element usually allow access for some users, so forms

    // submitted with self::submitForm() may bypass access restriction and be

    // treated as high-privilege users instead.

    $process_input = empty($element['#disabled']) && ($element['#type'] !== 'value') && (($form_state->isProgrammed() && $form_state->isBypassingProgrammedAccessChecks()) || ($form_state->isProcessingInput() && (!isset($element['#access']) || $element['#access'])));

    $process_input = empty($element['#disabled']) && !in_array($element['#type'], ['item', 'value'], TRUE) && (($form_state->isProgrammed() && $form_state->isBypassingProgrammedAccessChecks()) || ($form_state->isProcessingInput() && (!isset($element['#access']) || $element['#access'])));



    // Set the element's #value property.

    if (!isset($element['#value']) && !array_key_exists('#value', $element)) {

core/modules/media/src/MediaAccessControlHandler.php

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter 
        $media_storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId());

        $access = $this->access($media_storage->load($entity->id()), 'view', $account, TRUE);

        if (!$entity->isDefaultRevision()) {

          $access = $access->orIf($this->access($entity, 'view', $account, TRUE));

          $access = $access->andIf($this->access($entity, 'view', $account, TRUE));

        }

        return $access->cachePerPermissions()->addCacheableDependency($entity);

core/modules/node/src/NodeAccessControlHandler.php

+2 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ protected function checkAccess(EntityInterface $node, $operation, AccountInterfa 
      // node passed in is not the default revision then check access to

      // that, too.

      $node_storage = $this->entityTypeManager->getStorage($node->getEntityTypeId());

      $access = $this->access($node_storage->load($node->id()), 'view', $account, TRUE);

      $access = $this->access($node_storage->load($node->id()), $entity_operation, $account, TRUE);

      if (!$node->isDefaultRevision()) {

        $access = $access->orIf($this->access($node, 'view', $account, TRUE));

        $access = $access->andIf($this->access($node, $entity_operation, $account, TRUE));

      }

      return $access->cachePerPermissions()->addCacheableDependency($node);

    }