diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-05-26 13:37:30 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-05-26 13:37:30 +0300 |
| commit | f05345511bace85889aa9be5a83820897d322007 (patch) | |
| tree | ba9e6bf36477c714048fb04e6029925d3d713c47 /inc/actions.php | |
| parent | 325c7e9562ac271857d7490f978e3ce3c23952d1 (diff) | |
| parent | 5ff127375bd2292958b989dcec18dbca5a8a751f (diff) | |
| download | rpg-f05345511bace85889aa9be5a83820897d322007.tar.gz rpg-f05345511bace85889aa9be5a83820897d322007.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
Diffstat (limited to 'inc/actions.php')
| -rw-r--r-- | inc/actions.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/inc/actions.php b/inc/actions.php index a36fdfd5b..ecf09036f 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -509,10 +509,14 @@ function act_edit($act){ if(!$DATE) $DATE = $INFO['meta']['date']['modified']; //check if locked by anyone - if not lock for my self - $lockedby = checklock($ID); - if($lockedby) return 'locked'; + //do not lock when the user can't edit anyway + if ($INFO['writable']) { + $lockedby = checklock($ID); + if($lockedby) return 'locked'; + + lock($ID); + } - lock($ID); return $act; } |