Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / entity_browser / src / Controllers / EntityBrowserListBuilder.php

diff --git a/web/modules/contrib/entity_browser/src/Controllers/EntityBrowserListBuilder.php b/web/modules/contrib/entity_browser/src/Controllers/EntityBrowserListBuilder.php
index fe7d7c32e1a956cf6d93596d59fc0b285f610f3f..a6d5535ed277c91d02d89099dc5c9ebc00a3e4d4 100644 (file)
--- a/web/modules/contrib/entity_browser/src/Controllers/EntityBrowserListBuilder.php
+++ b/web/modules/contrib/entity_browser/src/Controllers/EntityBrowserListBuilder.php
@@ -36,4 +36,20 @@ class EntityBrowserListBuilder extends EntityListBuilder {
     return $row + parent::buildRow($entity);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDefaultOperations(EntityInterface $entity) {
+    $operations = parent::getDefaultOperations($entity);
+
+    // Destination parameter messes up with the entity form wizard redirects.
+    $options = $operations['edit']['url']->getOptions();
+    if (!empty($options['query']['destination'])) {
+      unset($options['query']['destination']);
+    }
+    $operations['edit']['url']->setOptions($options);
+
+    return $operations;
+  }
+
 }