Browse Source

fix array order

tags/v7.0.0alpha2
Bjoern Schiessle 10 years ago
parent
commit
a567f74d86
2 changed files with 4 additions and 5 deletions
  1. 3
    4
      apps/files_versions/lib/versions.php
  2. 1
    1
      apps/files_versions/tests/versions.php

+ 3
- 4
apps/files_versions/lib/versions.php View File

@@ -264,7 +264,7 @@ class Storage {
* @param string $uid user id from the owner of the file
* @param string $filename file to find versions of, relative to the user files dir
* @param string $userFullPath
* @returns array
* @returns array versions newest version first
*/
public static function getVersions($uid, $filename, $userFullPath = '') {
$versions = array();
@@ -397,7 +397,8 @@ class Storage {
}
}

ksort($versions);
// newest version first
krsort($versions);

$result = array();

@@ -428,8 +429,6 @@ class Storage {
$size = 0;
$toDelete = array(); // versions we want to delete

$versions = array_reverse($versions); // newest version first

$interval = 1;
$step = Storage::$max_versions_per_interval[$interval]['step'];
if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {

+ 1
- 1
apps/files_versions/tests/versions.php View File

@@ -40,7 +40,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
$startTime = 5000000;

$testClass = new VersionStorageToTest();
list($deleted, $size) = $testClass->callProtectedGetExpireList($startTime, array_reverse($versions));
list($deleted, $size) = $testClass->callProtectedGetExpireList($startTime, $versions);

// we should have deleted 16 files each of the size 1
$this->assertEquals($sizeOfAllDeletedFiles, $size);

Loading…
Cancel
Save