Verified Commit e4d694c3 authored by Dave Long's avatar Dave Long
Browse files

Issue #3413984 by quietone: Simple fixes for words with prefix of 'de' or 're' 

(cherry picked from commit 9089e7a9)
parent 4d350cdd

core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public function getDefinitions() { 
                $this->fileCache->set($fileinfo->getPathName(), ['id' => $id, 'content' => serialize($content)]);

              }

              else {

                // Store a NULL object, so the file is not reparsed again.

                // Store a NULL object, so the file is not parsed again.

                $this->fileCache->set($fileinfo->getPathName(), [NULL]);

              }

            }

core/lib/Drupal/Component/Plugin/Discovery/AttributeClassDiscovery.php

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public function getDefinitions() { 
                $this->fileCache->set($fileinfo->getPathName(), ['id' => $id, 'content' => serialize($content)]);

              }

              else {

                // Store a NULL object, so the file is not reparsed again.

                // Store a NULL object, so the file is not parsed again.

                $this->fileCache->set($fileinfo->getPathName(), [NULL]);

              }

            }

core/lib/Drupal/Core/Config/ConfigImporter.php

+2 −2
Original line number Diff line number Diff line
@@ -870,8 +870,8 @@ protected function processExtension($type, $op, $name) { 
      ->setSourceStorage($this->storageComparer->getSourceStorage());

    if ($type == 'module') {

      $this->moduleInstaller->$op([$name], FALSE);

      // Installing a module can cause a kernel boot therefore reinject all the

      // services.

      // Installing a module can cause a kernel boot therefore inject all the

      // services again.

      $this->reInjectMe();

      // During a module install or uninstall the container is rebuilt and the

      // module handler is called. This causes the container's instance of the

core/lib/Drupal/Core/DrupalKernel.php

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ protected function initializeContainer() { 
      $this->container->get('session')->start();

    }



    // The request stack is preserved across container rebuilds. Reinject the

    // The request stack is preserved across container rebuilds. Re-inject the

    // new session into the main request if one was present before.

    if (($request_stack = $this->container->get('request_stack', ContainerInterface::NULL_ON_INVALID_REFERENCE))) {

      if ($request = $request_stack->getMainRequest()) {

core/lib/Drupal/Core/Entity/EntityTypeInterface.php

+2 −2
Original line number Diff line number Diff line
@@ -518,8 +518,8 @@ public function getBaseTable(); 
   *

   * The implications of this method are left to the discretion of the caller.

   * For example, a module providing an HTTP API may not expose entities of

   * this type or a custom entity reference field settings form may deprioritize

   * entities of this type in a select list.

   * this type or a custom entity reference field settings form may reduce the

   * priority for entities of this type in a select list.

   *

   * @return bool

   *   TRUE if the entity data is internal, FALSE otherwise.