From 9ac8050de8cef1fc9d4dd366f98854339ae69b0d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 26 Apr 2022 06:06:16 +0000 Subject: [PATCH] [REV] web/lib: Revert: backport jquery bugfixes This reverts commit 0dd7c78b06726543825008a48d3dc004d2af4557. X-original-commit: b50cd480d3f40ab084689587e6cbed311c09fb2f Part-of: odoo/odoo#90463 --- addons/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js | 1 - addons/web/static/lib/jquery/jquery.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js b/addons/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js index 39f2892e932..3a5995d2b6c 100644 --- a/addons/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js +++ b/addons/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js @@ -468,7 +468,6 @@ coerce_types = { 'true': !0, 'false': !1, 'null': null }; // Iterate over all name=value pairs. - if (params.indexOf('__proto__') !== -1) { return obj; } $.each( params.replace( /\+/g, ' ' ).split( '&' ), function(j,v){ var param = v.split( '=' ), key = decode( param[0] ), diff --git a/addons/web/static/lib/jquery/jquery.js b/addons/web/static/lib/jquery/jquery.js index 0e6cacae756..01b858f1bf7 100644 --- a/addons/web/static/lib/jquery/jquery.js +++ b/addons/web/static/lib/jquery/jquery.js @@ -262,7 +262,7 @@ jQuery.extend = jQuery.fn.extend = function() { copy = options[ name ]; // Prevent never-ending loop - if ( name === '__proto__' || target === copy ) { + if ( target === copy ) { continue; }