Ticket #9375: Jcrop.noconflict.diff

wp-includes/js/jcrop/jquery.Jcrop.dev.js

@@ -27 +27 @@
 
  * }}}
  */
-
+(function($) {
 $.Jcrop = function(obj,opt)
 {
         // Initialization {{{
@@ -1080 +1080 @@
         // Return "this" so we're chainable a la jQuery plugin-style!
         return this;
 };
-/*}}}*/
-
+})(jQuery);
+/*}}}*/
+ No newline at end of file

wp-includes/script-loader.php

@@ -167 +167 @@
         $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20090123');
         $scripts->add_data( 'thickbox', 'group', 1 );
 
-        $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.5');
+        $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.5-1');
         
         if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
                 $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');