$EnableMergeLastMinorEdit can be a number of seconds.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4452 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 4 insertions, 1 deletions

diff --git a/pmwiki.php b/pmwiki.php
index bbabc22b..3e10673d 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -2551,8 +2551,11 @@ function MergeLastMinorEdit($pagename, &$page, &$new) {
   if ($page['host'] != $_SERVER['REMOTE_ADDR']) return;
   if ($page['author'] != @$Author) return;
   
-  $time = $page['time'];
+  $time = intval($page['time']);
   $text = $page['text'];
+  if ($EnableMergeLastMinorEdit >= 120) {
+    if ($Now - $time > $EnableMergeLastMinorEdit) return;
+  }
   
   $x = preg_grep("/^diff:$time:/", array_keys($page));
   if (!$x) return;