X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fentity_browser%2Fsrc%2FPlugin%2FEntityBrowser%2FWidget%2FUpload.php;fp=web%2Fmodules%2Fcontrib%2Fentity_browser%2Fsrc%2FPlugin%2FEntityBrowser%2FWidget%2FUpload.php;h=c6b2eb646bf7a4578ba637909d0ff6fac7bfd13c;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hp=9b5493c1ba2f13db4993c11e697ab627eeb77a1b;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/modules/contrib/entity_browser/src/Plugin/EntityBrowser/Widget/Upload.php b/web/modules/contrib/entity_browser/src/Plugin/EntityBrowser/Widget/Upload.php
index 9b5493c1b..c6b2eb646 100644
--- a/web/modules/contrib/entity_browser/src/Plugin/EntityBrowser/Widget/Upload.php
+++ b/web/modules/contrib/entity_browser/src/Plugin/EntityBrowser/Widget/Upload.php
@@ -99,6 +99,7 @@ class Upload extends WidgetBase {
   public function getForm(array &$original_form, FormStateInterface $form_state, array $additional_widget_parameters) {
     $form = parent::getForm($original_form, $form_state, $additional_widget_parameters);
     $field_cardinality = $form_state->get(['entity_browser', 'validators', 'cardinality', 'cardinality']);
+    $upload_validators = $form_state->has(['entity_browser', 'widget_context', 'upload_validators']) ? $form_state->get(['entity_browser', 'widget_context', 'upload_validators']) : [];
     $form['upload'] = [
       '#type' => 'managed_file',
       '#title' => $this->t('Choose a file'),
@@ -107,9 +108,9 @@ class Upload extends WidgetBase {
       // Multiple uploads will only be accepted if the source field allows
       // more than one value.
       '#multiple' => $field_cardinality != 1 && $this->configuration['multiple'],
-      '#upload_validators' => [
+      '#upload_validators' => array_merge([
         'file_validate_extensions' => [$this->configuration['extensions']],
-      ],
+      ], $upload_validators),
     ];
 
     return $form;