From: jeresig <jeresig@gmail.com>
Date: Fri, 24 Sep 2010 21:05:28 +0000 (-0400)
Subject: Merge branch 'master' of github.com:jquery/jquery
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=700ff05af0d30722dcc23a69849bfb278fdc7e75;hp=c8c8f8458a579d8f87e7ee6b8e4510cc4e4445bb;p=jquery.git

Merge branch 'master' of github.com:jquery/jquery
---

diff --git a/src/ajax.js b/src/ajax.js
index 17cccf7..71bdd46 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -207,7 +207,9 @@ jQuery.extend({
 			jsonp, status, data, type = s.type.toUpperCase();
 
 		s.url = s.url.replace( rhash, "" );
-		s.context = origSettings && origSettings.context || s;
+
+		// Use original (not extended) context object if it was provided
+		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
 
 		// convert data if not already a string
 		if ( s.data && s.processData && typeof s.data !== "string" ) {