Ticket #912: ticket912.patch

core/js/Story.js

@@ -584 +584 @@
                 var newTitle = fields.title || title;
                 if(!store.tiddlerExists(newTitle))
                         newTitle = newTitle.trim();
-                if(store.tiddlerExists(newTitle) && newTitle != title) {
-                        if(!confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
-                                return null;
-                }
-                if(newTitle != title)
+                var rename = false;
+                if(newTitle != title) {
+                        rename = true;
+                        if(store.tiddlerExists(newTitle)) {
+                                if(!confirm(config.messages.overwriteWarning.format([newTitle.toString()])))
+                                        return null;
+                        }
                         this.closeTiddler(newTitle,false);
+                }
                 tiddlerElem.id = this.tiddlerId(newTitle);
                 tiddlerElem.setAttribute("tiddler",newTitle);
                 tiddlerElem.setAttribute("template",DEFAULT_VIEW_TEMPLATE);
@@ -599 +602 @@
                 if(!store.tiddlerExists(newTitle))
                         minorUpdate = false;
                 var newDate = new Date();
-                var extendedFields = store.tiddlerExists(newTitle) ? store.fetchTiddler(newTitle).fields : (newTitle!=title && store.tiddlerExists(title) ? store.fetchTiddler(title).fields : merge({},config.defaultCustomFields));
+                if(store.tiddlerExists(newTitle) && !rename) {
+                        var extendedFields = store.fetchTiddler(newTitle).fields
+                } else {
+                        extendedFields = rename && store.tiddlerExists(title) ? store.fetchTiddler(title).fields : merge({},config.defaultCustomFields)
+                }
                 for(var n in fields) {
                         if(!TiddlyWiki.isStandardField(n))
                                 extendedFields[n] = fields[n];