From 01afcc532ae681609ae6d448b6b7ff9c3d675f86 Mon Sep 17 00:00:00 2001
From: ahollosi <ahollosi@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 21 Jun 2000 23:55:45 +0000
Subject: [PATCH] fixed ConcurrentUpdate bug when doing EditCopy and versions
 difference >1. fixed logic for when EditCopy link may appear

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@88 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 wiki_editpage.php3 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/wiki_editpage.php3 b/wiki_editpage.php3
index c4412126a..ed5cea2d6 100644
--- a/wiki_editpage.php3
+++ b/wiki_editpage.php3
@@ -1,4 +1,4 @@
-<!-- $Id: wiki_editpage.php3,v 1.8 2000-06-18 15:12:13 ahollosi Exp $ -->
+<!-- $Id: wiki_editpage.php3,v 1.9 2000-06-21 23:55:45 ahollosi Exp $ -->
 <?
 
    // editpage relies on $pagename and $ScriptUrl
@@ -23,13 +23,16 @@
    $pagehash = RetrievePage($dbi, $pagename);
 
    if (is_array($pagehash)) {
-      $textarea = implode($pagehash["content"], "\n");
-      if (($pagehash["version"] > 1) &&
-          ($pagehash["author"] != $remoteuser)) {  ### FIXME - should compare with author of archived version
-         $pagehash["copy"] = 1;
+      $textarea = implode("\n", $pagehash["content"]);
+      if($copy) {
+	 $cdbi = OpenDataBase($WikiDataBase);
+	 $currentpage = RetrievePage($cdbi, $pagename);
+         $pagehash["version"] = $currentpage["version"];
       }
-      if($copy) {		### FIXME - version++ is wrong
-         $pagehash["version"]++;
+      elseif ($pagehash["version"] > 1) {
+	 $adbi = OpenDataBase($ArchiveDataBase);
+	 if(IsWikiPage($adbi, $pagename))
+           $pagehash["copy"] = 1;
       }
    } else {
       $textarea = "Describe " . htmlspecialchars($pagename) . " here.";
-- 
2.45.0