diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 20:56:19 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 20:56:19 +0100 |
| commit | 0153fa96cb29b93c2a83a6eff409e1010a8f7b07 (patch) | |
| tree | be6c37f7ffbf60e6787d11d8c5b3623287f23c62 /inc | |
| parent | 6fa4721ac57074f958b12cf2cf28a489f24e89e1 (diff) | |
| parent | fed2ee900d012e5ebccad2796d0850034ac7729b (diff) | |
| download | rpg-0153fa96cb29b93c2a83a6eff409e1010a8f7b07.tar.gz rpg-0153fa96cb29b93c2a83a6eff409e1010a8f7b07.tar.bz2 | |
Merge pull request #923 from splitbrain/addLogEntry
Make addLogEntry independent of global var INFO
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/changelog.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/changelog.php b/inc/changelog.php index cb3cd2aeb..c2d3cb489 100644 --- a/inc/changelog.php +++ b/inc/changelog.php @@ -83,17 +83,19 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr 'extra' => str_replace($strip, '', $extra) ); + $wasCreated = ($type===DOKU_CHANGE_TYPE_CREATE); + $wasReverted = ($type===DOKU_CHANGE_TYPE_REVERT); // update metadata if (!$wasRemoved) { $oldmeta = p_read_metadata($id); $meta = array(); - if (!$INFO['exists'] && empty($oldmeta['persistent']['date']['created'])){ // newly created + if ($wasCreated && empty($oldmeta['persistent']['date']['created'])){ // newly created $meta['date']['created'] = $created; if ($user){ $meta['creator'] = $INFO['userinfo']['name']; $meta['user'] = $user; } - } elseif (!$INFO['exists'] && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored + } elseif (($wasCreated || $wasReverted) && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored $meta['date']['created'] = $oldmeta['persistent']['date']['created']; $meta['date']['modified'] = $created; // use the files ctime here $meta['creator'] = $oldmeta['persistent']['creator']; |