aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-03-17 23:57:03 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-03-17 23:57:03 +0000
commit26213f8ee443addfbc74e92a693e172d023b16e6 (patch)
treeb034bfda2dc1ff04a7a5669f4c1a8d8747629915 /templates
parent50a9ef47538666c565c26ad7125a9e6484330cfd (diff)
downloadikiwiki-26213f8ee443addfbc74e92a693e172d023b16e6.tar
ikiwiki-26213f8ee443addfbc74e92a693e172d023b16e6.tar.gz
* Detect the case of two people independently creating the same page at the
same time, and let the second person resolve the conflict.
Diffstat (limited to 'templates')
-rw-r--r--templates/editpage.tmpl11
1 files changed, 11 insertions, 0 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 15a4069c0..3b3570a44 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -42,6 +42,17 @@ Perhaps someone else has deleted it or moved it. If you want to recreate
this page with your text, click "Save Page" again.
</p>
</TMPL_IF>
+<TMPL_IF NAME="CREATION_CONFLICT">
+<p>
+<b>While you were creating this page, someone else independently created a page
+with the same name.</b>
+</p>
+<p>
+The edit box below contains the page's current content, followed by the
+content you entered previously, to allow you to merge the two contents
+together before saving.
+</p>
+</TMPL_IF>
<TMPL_VAR FORM-START>
<div class="header">
<span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>