From cf8c1249d1efbdaf4f4dd8d1a36bb803335f4ee8 Mon Sep 17 00:00:00 2001
From: Ariel Flesler <aflesler@gmail.com>
Date: Tue, 15 Sep 2009 16:45:37 +0000
Subject: [PATCH] jquery ajax: addition for #2452. Wasn't working correctly in
 some cases.

---
 src/ajax.js       |    4 ++--
 test/unit/ajax.js |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 9696bb3..47e6635 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -113,7 +113,7 @@ jQuery.extend({
 	get: function( url, data, callback, type ) {
 		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
-			type = callback;
+			type = type || callback;
 			callback = data;
 			data = null;
 		}
@@ -138,7 +138,7 @@ jQuery.extend({
 	post: function( url, data, callback, type ) {
 		// shift arguments if data argument was omited
 		if ( jQuery.isFunction( data ) ) {
-			type = callback;
+			type = type || callback;
 			callback = data;
 			data = {};
 		}
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4478c9b..564f692 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -726,9 +726,10 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
 });
 
 test("jQuery.getJSON(String, Hash, Function) - JSON array", function() {
-	expect(4);
+	expect(5);
 	stop();
 	jQuery.getJSON(url("data/json.php"), {json: "array"}, function(json) {
+	  ok( json.length >= 2, "Check length");
 	  equals( json[0].name, 'John', 'Check JSON: first, name' );
 	  equals( json[0].age, 21, 'Check JSON: first, age' );
 	  equals( json[1].name, 'Peter', 'Check JSON: second, name' );
@@ -741,8 +742,10 @@ test("jQuery.getJSON(String, Function) - JSON object", function() {
 	expect(2);
 	stop();
 	jQuery.getJSON(url("data/json.php"), function(json) {
-	  equals( json.data.lang, 'en', 'Check JSON: lang' );
-	  equals( json.data.length, 25, 'Check JSON: length' );
+	  if (json && json.data) {
+		  equals( json.data.lang, 'en', 'Check JSON: lang' );
+		  equals( json.data.length, 25, 'Check JSON: length' );
+	  }
 	  start();
 	});
 });
-- 
1.7.10.4