Merge branch 'MDL-48006-master' of git://github.com/damyon/moodle

moodle · Nov 4, 2014 · 1d91558 · 1d91558
2 parents 990ebf0 + c942fdd
commit 1d91558
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -864,7 +864,8 @@ EditorAutosave.prototype = {
                         if (response_json.error || typeof response_json.result === 'undefined') {
                             Y.log('Error occurred recovering draft text: ' + response_json.error, 'debug', LOGNAME_AUTOSAVE);
                             this.showMessage(M.util.get_string('errortextrecovery', 'editor_atto'), NOTIFY_WARNING, RECOVER_MESSAGE_TIMEOUT);
-                        } else if (response_json.result !== this.textarea.get('value')) {
+                        } else if (response_json.result !== this.textarea.get('value') &&
+                                response_json.result !== '') {
                             Y.log('Autosave text found - recover it.', 'debug', LOGNAME_AUTOSAVE);
                             this.recoverText(response_json.result);
                         }