summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-05-22 21:49:59 +0200
committerAndreas Gohr <andi@splitbrain.org>2012-05-22 21:49:59 +0200
commit78035fe8ffc269afc488a230cb7c7f73e2fb10a0 (patch)
tree937cf188e7b6313905ca4a5e5d6e80160aab454f
parentf32f3fdf247618fa521b53042b833cc41d37b0a2 (diff)
downloadrpg-78035fe8ffc269afc488a230cb7c7f73e2fb10a0.tar.gz
rpg-78035fe8ffc269afc488a230cb7c7f73e2fb10a0.tar.bz2
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.
-rw-r--r--inc/actions.php2
1 files changed, 1 insertions, 1 deletions
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