Return control of $ and jQuery only if it is really necessary. This make

jQuery.noConflict() callable anytime.

diff --git a/src/core.js b/src/core.js
index 99521d91cd274065495a773823ce49cbba9a7062..f701a20c1fa56aa30aef4536d206ae4e67ed25ab 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -373,9 +373,9 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
        noConflict: function( deep ) {
-               window.$ = _$;
+               if ( window.$ === jQuery ) window.$ = _$;
 
-               if ( deep ) {
+               if ( deep && window.jQuery === jQuery ) {
                        window.jQuery = _jQuery;
                }