Merge "Add ext-dom to composer.json"

[lhc/web/wiklou.git] / resources / lib / jquery / jquery-3.3.1.patch

diff --git a/resources/lib/jquery/jquery-3.3.1.patch b/resources/lib/jquery/jquery-3.3.1.patch
index 68a4326..0681831 100644 (file)
--- a/resources/lib/jquery/jquery-3.3.1.patch
+++ b/resources/lib/jquery/jquery-3.3.1.patch
@@ -1,8 +1,9 @@
---- jquery-3.3.1.js    2019-04-01 08:39:29.000000000 +0200
-+++ jquery-3.3.1.js    2019-04-01 09:02:39.000000000 +0200
-@@ -260,8 +260,9 @@ jQuery.extend = jQuery.fn.extend = function() {
-                       for ( name in options ) {
-                               src = target[ name ];
+diff --git a/resources/lib/jquery/jquery.js b/resources/lib/jquery/jquery.js
+index 9b5206bcc6..34a5703d80 100644
+--- a/resources/lib/jquery/jquery.js
++++ b/resources/lib/jquery/jquery.js
+@@ -261,8 +261,9 @@ jQuery.extend = jQuery.fn.extend = function() {
+                               src = target[ name ];
                                copy = options[ name ];
  
 +                              // Prevent Object.prototype pollution