mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save uid instead of user object in command

This commit is contained in:
Robin Appelman 2015-03-26 17:11:34 +01:00
parent 8c903c100f
commit 1969c8d5c8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_versions/command/expire.php
View File

@ -32,17 +32,17 @@ class Expire implements ICommand {
private $neededSpace = 0; private $neededSpace = 0;
/** /**
* @var int * @var string
*/ */
private $user; private $user;
/** /**
* @param IUser $user * @param string $user
* @param string $fileName * @param string $fileName
* @param int|null $versionsSize * @param int|null $versionsSize
* @param int $neededSpace * @param int $neededSpace
*/ */
function __construct(IUser $user, $fileName, $versionsSize = null, $neededSpace = 0) { function __construct($user, $fileName, $versionsSize = null, $neededSpace = 0) {
$this->user = $user; $this->user = $user;
$this->fileName = $fileName; $this->fileName = $fileName;
$this->versionsSize = $versionsSize; $this->versionsSize = $versionsSize;
@ -51,7 +51,7 @@ class Expire implements ICommand {
public function handle() { public function handle() {
$this->setupFS($this->user); \OC_Util::setupFS($this->user);
Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace); Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace);
} }
} }

2
apps/files_versions/lib/storage.php
View File

@ -483,7 +483,7 @@ class Storage {
* @param int $neededSpace * @param int $neededSpace
*/ */
private static function scheduleExpire($fileName, $versionsSize = null, $neededSpace = 0) { private static function scheduleExpire($fileName, $versionsSize = null, $neededSpace = 0) {
$command = new Expire(\OC::$server->getUserSession()->getUser(), $fileName, $versionsSize, $neededSpace); $command = new Expire(\OC::$server->getUserSession()->getUser()->getUID(), $fileName, $versionsSize, $neededSpace);
\OC::$server->getCommandBus()->push($command); \OC::$server->getCommandBus()->push($command);
} }