From 28a1f022233585cf40ae727d7d8334665a495e61 Mon Sep 17 00:00:00 2001
From: John Resig <jeresig@gmail.com>
Date: Tue, 20 Jan 2009 16:00:48 +0000
Subject: [PATCH] Re-worked the logic for where .selector and .context are
 added for ID selectors (especially ones that aren't found). Fixes jQuery bug
 #3833.

---
 src/core.js       | 24 ++++++++++--------------
 test/unit/core.js |  6 +++++-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/core.js b/src/core.js
index 13efaec0c3..585b200aec 100644
--- a/src/core.js
+++ b/src/core.js
@@ -47,20 +47,16 @@ jQuery.fn = jQuery.prototype = {
 				else {
 					var elem = document.getElementById( match[3] );
 
-					// Make sure an element was located
-					if ( elem ){
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id != match[3] )
-							return jQuery().find( selector );
-
-						// Otherwise, we inject the element directly into the jQuery object
-						var ret = jQuery( elem );
-						ret.context = document;
-						ret.selector = selector;
-						return ret;
-					}
-					selector = [];
+					// Handle the case where IE and Opera return items
+					// by name instead of ID
+					if ( elem && elem.id != match[3] )
+						return jQuery().find( selector );
+
+					// Otherwise, we inject the element directly into the jQuery object
+					var ret = jQuery( elem || [] );
+					ret.context = document;
+					ret.selector = selector;
+					return ret;
 				}
 
 			// HANDLE: $(expr, [context])
diff --git a/test/unit/core.js b/test/unit/core.js
index c8c7cad7ad..aec334e52b 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -53,7 +53,7 @@ test("jQuery()", function() {
 });
 
 test("selector state", function() {
-	expect(28);
+	expect(30);
 
 	var test;
 	
@@ -72,6 +72,10 @@ test("selector state", function() {
 	test = jQuery("#main");
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document, "#main Context" );
+
+	test = jQuery("#notfoundnono");
+	equals( test.selector, "#notfoundnono", "#notfoundnono Selector" );
+	equals( test.context, document, "#notfoundnono Context" );
 	
 	test = jQuery("#main", document);
 	equals( test.selector, "#main", "#main Selector" );