diff options
| author | Henrik Kjölhede <hkjolhede@gmail.com> | 2013-01-26 21:51:18 +0100 |
|---|---|---|
| committer | Henrik Kjölhede <hkjolhede@gmail.com> | 2013-01-26 21:51:18 +0100 |
| commit | b1b2eafa50db54b2613cf2bc52bfab2015d67b2f (patch) | |
| tree | 68992916824e3bdd4c6ba9ab5af955420bfd8123 /apps/files_versions/ajax/rollbackVersion.php | |
| parent | a26d50640fc4a2524255c85b10fb010676b3e22d (diff) | |
| parent | c9e25d3fab17b178759dd6d2f9488aa4cf37fbbb (diff) | |
| download | nextcloud-server-b1b2eafa50db54b2613cf2bc52bfab2015d67b2f.tar.gz nextcloud-server-b1b2eafa50db54b2613cf2bc52bfab2015d67b2f.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
apps/files_external/lib/config.php
Diffstat (limited to 'apps/files_versions/ajax/rollbackVersion.php')
| -rw-r--r-- | apps/files_versions/ajax/rollbackVersion.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index f1b02eb4b92..f2c211d9c1e 100644 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -8,10 +8,9 @@ $userDirectory = "/".OCP\USER::getUser()."/files"; $file = $_GET['file']; $revision=(int)$_GET['revision']; -if( OCA_Versions\Storage::isversioned( $file ) ) { - if(OCA_Versions\Storage::rollback( $file, $revision )) { - OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); - }else{ - OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file ))); - } +if(OCA_Versions\Storage::rollback( $file, $revision )) { + OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); +}else{ + OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file ))); } + |