diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-10 17:08:22 -0700 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-10 17:08:22 -0700 |
| commit | 05b30d79901375b2df9956ecb8ecddaa79937a64 (patch) | |
| tree | f6683a69da9fce5ebd220992457e7635cf22d4fa | |
| parent | f5e8b87324f800ddf572684b4cfeb414e1d34d21 (diff) | |
| parent | 7656ee3b68e4877d64b1931c584ad433da62632c (diff) | |
| download | rpg-05b30d79901375b2df9956ecb8ecddaa79937a64.tar.gz rpg-05b30d79901375b2df9956ecb8ecddaa79937a64.tar.bz2 | |
Merge pull request #105 from lupo49/master
Additional commit for closed Pull Request #100
| -rw-r--r-- | inc/actions.php | 2 | ||||
| -rw-r--r-- | inc/media.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/actions.php b/inc/actions.php index adc251bc4..e85cbfccc 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -498,7 +498,7 @@ function act_edit($act){ //set summary default if(!$SUM){ if($REV){ - $SUM = $lang['restored']; + $SUM = sprintf($lang['restored'], dformat($REV)); }elseif(!$INFO['exists']){ $SUM = $lang['created']; } diff --git a/inc/media.php b/inc/media.php index 841a5218e..2462a1deb 100644 --- a/inc/media.php +++ b/inc/media.php @@ -420,7 +420,7 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov media_notify($id,$fn,$imime,$old); // add a log entry to the media changelog if ($REV){ - addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, $lang['restored'], $REV); + addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, sprintf($lang['restored'], dformat($REV)), $REV); } elseif ($overwrite) { addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT); } else { |