From 78035fe8ffc269afc488a230cb7c7f73e2fb10a0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 22 May 2012 21:49:59 +0200
Subject: [PATCH] don't rely on metadata for conflict detection

This also fixes a problem wiht PHP 5.4 when there is metadata but the
date key is empty.
---
 inc/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/actions.php b/inc/actions.php
index 458926345..adc251bc4 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -506,7 +506,7 @@ function act_edit($act){
 
     // Use the date of the newest revision, not of the revision we edit
     // This is used for conflict detection
-    if(!$DATE) $DATE = $INFO['meta']['date']['modified'];
+    if(!$DATE) $DATE = @filemtime(wikiFN($ID));
 
     //check if locked by anyone - if not lock for my self
     //do not lock when the user can't edit anyway
-- 
GitLab