From c353f9c041534dafa015bbb27d8b494f369d134f Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 23 May 2013 22:30:18 -0400 Subject: [PATCH 1/2] Revert "fixes #1653" This reverts commit 861ade54cf489a46e42388c5c6419023e998ab7d. --- app/models/artist.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/artist.rb b/app/models/artist.rb index 82efc65fc..45b09435e 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -148,14 +148,10 @@ class Artist < ActiveRecord::Base end def notes=(msg) - if name_changed? && name_was.present? - wiki_page = WikiPage.titled(name_was).first - end - if wiki_page wiki_page.title = name wiki_page.body = msg - wiki_page.save if wiki_page.body_changed? || wiki_page.title_changed? + wiki_page.save if wiki_page.body_changed? else if msg.present? self.wiki_page = WikiPage.new(:title => name, :body => msg) From e9593dd97548ce8b8468c60022154494753b7222 Mon Sep 17 00:00:00 2001 From: Toks Date: Thu, 23 May 2013 23:19:39 -0400 Subject: [PATCH 2/2] fixes #1664 --- app/models/note.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/note.rb b/app/models/note.rb index ccbec9de2..3ca9c5347 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -177,6 +177,7 @@ class Note < ActiveRecord::Base def copy_to(new_post) new_note = dup new_note.post_id = new_post.id + new_note.version = 0 width_ratio = new_post.image_width.to_f / post.image_width height_ratio = new_post.image_height.to_f / post.image_height