Commit a9ec667e authored by Jess's avatar Jess
Browse files

Merged 8.9.6.

parents fd821085 db320ce4

composer.lock

+1 −0
Original line number Diff line number Diff line
@@ -5512,6 +5512,7 @@ 
            "keywords": [

                "tokenizer"

            ],

            "abandoned": true,

            "time": "2017-11-27T05:48:46+00:00"

        },

        {

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

+2 −1
Original line number Diff line number Diff line
@@ -861,7 +861,8 @@ protected function buildFormAction() { 
    //   https://www.drupal.org/node/2504709.

    $parsed = UrlHelper::parse($request_uri);

    unset($parsed['query'][static::AJAX_FORM_REQUEST], $parsed['query'][MainContentViewSubscriber::WRAPPER_FORMAT]);

    return $parsed['path'] . ($parsed['query'] ? ('?' . UrlHelper::buildQuery($parsed['query'])) : '');

    $action =  $parsed['path'] . ($parsed['query'] ? ('?' . UrlHelper::buildQuery($parsed['query'])) : '');

    return UrlHelper::filterBadProtocol($action);

  }



  /**

core/misc/ajax.es6.js

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ 
        }

      },

      dataType: 'json',

      jsonp: false,

      type: 'POST',

    };

core/misc/ajax.js

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr 
      },



      dataType: 'json',

      jsonp: false,

      type: 'POST'

    };

core/misc/autocomplete.es6.js

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ 
    },

    ajax: {

      dataType: 'json',

      jsonp: false,

    },

  };