Ticket #3871: 3871_2.patch

_source/plugins/editingblock/plugin.js

@@ -171 +171 @@
 
                         var currentMode = getMode( this );
                         data = currentMode.getData();
+                        data = this.fire( 'beforeModeUnload', data );
                         currentMode.unload( holderElement );
                         this.mode = '';
                 }

_source/plugins/undo/plugin.js

@@ -81 +81 @@
 
                         } );
 
+                        // Always save an undo snapshot - the previous mode might have
+                        // changed editor contents.
+                        editor.on( 'beforeModeUnload', function()
+                        {
+                                editor.mode == 'wysiwyg' && undoManager.save( true );
+                        } );
+
                         // Make the undo manager available only in wysiwyg mode.
                         editor.on( 'mode', function()
                                 {
-                                        if ( editor.mode == 'wysiwyg' )
-                                        {
-                                                if ( !undoManager.enabled )
-                                                {
-                                                        undoManager.enabled = true;
-                                                        // Always save an undo snapshot - the previous mode might have changed
-                                                        // editor contents.
-                                                        undoManager.save( true );
-                                                }
-                                        }
-                                        else
-                                                undoManager.enabled = false;
-
+                                        undoManager.enabled = editor.mode == 'wysiwyg';
                                         undoManager.onChange();
                                 });
 

CHANGES.html

@@ -88 +88 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3825">#3825</a> : Fixed JS error when opening spellingcheck.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3862">#3862</a> : Fixed html parser infinite loop on certain malformed 
                         source code.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3871">#3871</a> : Unable to redo when undos to the front of snapshots stack.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>