diff --git a/r2/r2/public/static/js/wiki.js b/r2/r2/public/static/js/wiki.js index f3988ce88..7de75419b 100644 --- a/r2/r2/public/static/js/wiki.js +++ b/r2/r2/public/static/js/wiki.js @@ -94,7 +94,7 @@ r.wiki = { statusCode: { 409: function(xhr) { var info = JSON.parse(xhr.responseText) - ,content = $this.children('#content') + ,content = $this.children('#wiki_page_content') conflict.children('#youredit').val(content.val()) conflict.children('#yourdiff').html(info.diffcontent) $this.children('#previous').val(info.newrevision) diff --git a/r2/r2/templates/wikieditpage.html b/r2/r2/templates/wikieditpage.html index f69c0ff30..fb7bcd2a7 100644 --- a/r2/r2/templates/wikieditpage.html +++ b/r2/r2/templates/wikieditpage.html @@ -39,7 +39,7 @@