From b1127248e29c4a6f9811705f7e027b005ee2ac34 Mon Sep 17 00:00:00 2001
From: Andre D <andre@andred.ca>
Date: Thu, 13 Dec 2012 18:25:08 -0500
Subject: [PATCH] wiki: Change a conflicting id.

---
 r2/r2/public/static/js/wiki.js    | 2 +-
 r2/r2/templates/wikieditpage.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 @@
 </div>
 
 <form method="post" id="editform" onsubmit="r.wiki.submitEdit(event)">
-    <textarea name="content" rows="20" cols="20" style="width: 100%" id="content">${keep_space(thing.page_content)}</textarea>
+    <textarea name="content" rows="20" cols="20" style="width: 100%" id="wiki_page_content">${keep_space(thing.page_content)}</textarea>
     <br/><br/>
     <label for="reason">${_("reason for revision")}</label><br/>
     <input type="text" name="reason" maxlength="256" id="wiki_revision_reason" />