diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-06-04 23:02:05 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-06-04 23:02:05 +0200 |
| commit | 4a5973662c78eb5769e7b06d7d559572f57e663f (patch) | |
| tree | 774e2f775b3789f5f40bd2459ddec05df1b73c31 /apps/files_versions/templates | |
| parent | 786325a4bb976d92de54c472c2c3bd8a73cbef22 (diff) | |
| parent | 3fee3a4633e5d4d65f7eabf2d387e209efedbc70 (diff) | |
| download | nextcloud-server-4a5973662c78eb5769e7b06d7d559572f57e663f.tar.gz nextcloud-server-4a5973662c78eb5769e7b06d7d559572f57e663f.zip | |
Merge branch 'unstable'
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
Diffstat (limited to 'apps/files_versions/templates')
| -rw-r--r-- | apps/files_versions/templates/history.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php index 58fea75a0d0..13e104152b7 100644 --- a/apps/files_versions/templates/history.php +++ b/apps/files_versions/templates/history.php @@ -22,8 +22,10 @@ if( isset( $_['message'] ) ) { foreach ( $_['versions'] as $v ) { echo ' '; - echo OCP\Util::formatDate( $v ); - echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v .'" class="button">Revert</a><br /><br />'; + echo OCP\Util::formatDate( $v['version'] ); + echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />'; + if ( $v['cur'] ) { echo ' (<b>Current</b>)'; } + echo '<br /><br />'; } |