opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed typos

This commit is contained in:
Damien Regad 2021-02-06 01:21:34 +01:00
parent 056bf31f71
commit 63f13cad5e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/changelog.php
View File

@ -38,7 +38,7 @@ function parseChangelogLine($line) {
} }
/** /**
* Add's an entry to the changelog and saves the metadata for the page * Adds an entry to the changelog and saves the metadata for the page
* *
* @param int $date Timestamp of the change * @param int $date Timestamp of the change
* @param String $id Name of the affected page * @param String $id Name of the affected page
@ -94,12 +94,12 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
$wasReverted = ($type===DOKU_CHANGE_TYPE_REVERT); $wasReverted = ($type===DOKU_CHANGE_TYPE_REVERT);
// update metadata // update metadata
if (!$wasRemoved) { if (!$wasRemoved) {
$oldmeta = p_read_metadata($id); $oldmeta = p_read_metadata($id)['persistent'];
$meta = array(); $meta = array();
if ( if (
$wasCreated && ( $wasCreated && (
empty($oldmeta['persistent']['date']['created']) || empty($oldmeta['date']['created']) ||
$oldmeta['persistent']['date']['created'] === $created $oldmeta['date']['created'] === $created
) )
){ ){
// newly created // newly created
@ -108,11 +108,11 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr
$meta['creator'] = isset($INFO) ? $INFO['userinfo']['name'] : null; $meta['creator'] = isset($INFO) ? $INFO['userinfo']['name'] : null;
$meta['user'] = $user; $meta['user'] = $user;
} }
} elseif (($wasCreated || $wasReverted) && !empty($oldmeta['persistent']['date']['created'])) { } elseif (($wasCreated || $wasReverted) && !empty($oldmeta['date']['created'])) {
// re-created / restored // re-created / restored
$meta['date']['created'] = $oldmeta['persistent']['date']['created']; $meta['date']['created'] = $oldmeta['date']['created'];
$meta['date']['modified'] = $created; // use the files ctime here $meta['date']['modified'] = $created; // use the files ctime here
$meta['creator'] = $oldmeta['persistent']['creator']; $meta['creator'] = isset($oldmeta['creator']) ? $oldmeta['creator'] : null;
if ($user) $meta['contributor'][$user] = isset($INFO) ? $INFO['userinfo']['name'] : null; if ($user) $meta['contributor'][$user] = isset($INFO) ? $INFO['userinfo']['name'] : null;
} elseif (!$minor) { // non-minor modification } elseif (!$minor) { // non-minor modification
$meta['date']['modified'] = $date; $meta['date']['modified'] = $date;

2
inc/template.php
View File

@ -297,7 +297,7 @@ function tpl_metaheaders($alt = true) {
} }
} }
// setup robot tags apropriate for different modes // setup robot tags appropriate for different modes
if(($ACT == 'show' || $ACT == 'export_xhtml') && !$REV) { if(($ACT == 'show' || $ACT == 'export_xhtml') && !$REV) {
if($INFO['exists']) { if($INFO['exists']) {
//delay indexing: //delay indexing: