Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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.
  • Loading branch information...
commit 78035fe8ffc269afc488a230cb7c7f73e2fb10a0 1 parent f32f3fd
@splitbrain authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  inc/actions.php
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.