]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #1827 from owncloud/fix_getVersions
authorBernhard Posselt <nukeawhale@gmail.com>
Mon, 25 Feb 2013 12:59:47 +0000 (04:59 -0800)
committerBernhard Posselt <nukeawhale@gmail.com>
Mon, 25 Feb 2013 12:59:47 +0000 (04:59 -0800)
fix getVersions(), we need to get the correct user and filename

1  2 
apps/files_versions/lib/versions.php

index adbf2c1df7eca13ecb466692041dc1e62d70cc1b,ff55549c143e8462744896027a1d15a403001c1f..abc5870a48527be33d4e00ab0070bd2447df7b74
@@@ -19,25 -19,24 +19,25 @@@ class Storage 
  
        const DEFAULTENABLED=true;
        const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
 -      
 +
        private static $max_versions_per_interval = array(
 -                                                                                                              1 => array('intervalEndsAfter' => 10,     //first 10sec, one version every 2sec
 -                                                                                                                                      'step' => 2),
 -                                                                                                              2 => array('intervalEndsAfter' => 60,     //next minute, one version every 10sec
 -                                                                                                                                      'step' => 10),
 -                                                                                                              3 => array('intervalEndsAfter' => 3600,     //next hour, one version every minute
 -                                                                                                                                      'step' => 60),
 -                                                                                                              4 => array('intervalEndsAfter' => 86400,   //next 24h, one version every hour
 -                                                                                                                                      'step' => 3600),
 -                                                                                                              5 => array('intervalEndsAfter' => 2592000,   //next 30days, one version per day
 -                                                                                                                                      'step' => 86400),
 -                                                                                                              6 => array('intervalEndsAfter' => -1,      //until the end one version per week
 -                                                                                                                                      'step' => 604800),
 -                      );      
 +              //first 10sec, one version every 2sec
 +              1 => array('intervalEndsAfter' => 10,      'step' => 2),
 +              //next minute, one version every 10sec
 +              2 => array('intervalEndsAfter' => 60,      'step' => 10),
 +              //next hour, one version every minute
 +              3 => array('intervalEndsAfter' => 3600,    'step' => 60),
 +              //next 24h, one version every hour
 +              4 => array('intervalEndsAfter' => 86400,   'step' => 3600),
 +              //next 30days, one version per day
 +              5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
 +              //until the end one version per week
 +              6 => array('intervalEndsAfter' => -1,      'step' => 604800),
 +      );
  
-       private static function getUidAndFilename($filename) {
+       public static function getUidAndFilename($filename) {
                $uid = \OC\Files\Filesystem::getOwner($filename);
 +              \OC\Files\Filesystem::initMountPoints($uid);
                if ( $uid != \OCP\User::getUser() ) {
                        $info = \OC\Files\Filesystem::getFileInfo($filename);
                        $ownerView = new \OC\Files\View('/'.$uid.'/files');