Ticket #3517: 3517.patch

_source/plugins/find/dialogs/find.js

@@ -425 +425 @@
                 var finder = {
                         searchRange : null,
                         matchRange : null,
-                        find : function( pattern, matchCase, matchWord, matchCyclic, highlightMatched )
+                        find : function( pattern, matchCase, matchWord, matchCyclic, highlightMatched, cyclicRerun )
                         {
                                 if( !this.matchRange )
                                         this.matchRange =
@@ -480 +480 @@
                                 this.matchRange.removeHighlight();
                                 // Clear current session and restart with the default search
                                 // range.
-                                if ( matchCyclic )
+                                if ( matchCyclic && !cyclicRerun )
                                 {
                                         this.searchRange = getSearchRange( true );
                                         this.matchRange = null;
+                                        // Clone arguments
+                                        var newArgs = [];
+                                        for ( var i = 0 ; i < arguments.length ; i++ )
+                                                newArgs[ i ] = arguments[ i ];
+                                        // Set cyclicRerun flag to avoid infinitive loop.
+                                        newArgs[ 5 ] = true;
+                                        return arguments.callee.apply( this, newArgs );
                                 }
 
                                 return false;

CHANGES.html

@@ -61 +61 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3633">#3633</a> : Default context menu isn't disabled in toolbar, status bar, panels...</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3897">#3897</a> : Now there is no image previews when the URL is empty in image dialog.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4048">#4048</a> : Context submenu was lacking uiColor.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3517">#3517</a> : Fixed "Match cyclic" field in Find & Replace dialog.</li>
         </ul>
         <h3>
                 CKEditor 3.0</h3>