save uid instead of user object in command

diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php
index a934b0f715947dbf46b10244b63b1b8d8982b3cd..fe596d375435fab6ef746d036bbf89cfd5033c84 100644 (file)
--- a/apps/files_versions/command/expire.php
+++ b/apps/files_versions/command/expire.php
@@ -32,17 +32,17 @@ class Expire implements ICommand {
        private $neededSpace = 0;
 
        /**
-        * @var int
+        * @var string
         */
        private $user;
 
        /**
-        * @param IUser $user
+        * @param string $user
         * @param string $fileName
         * @param int|null $versionsSize
         * @param int $neededSpace
         */
-       function __construct(IUser $user, $fileName, $versionsSize = null, $neededSpace = 0) {
+       function __construct($user, $fileName, $versionsSize = null, $neededSpace = 0) {
                $this->user = $user;
                $this->fileName = $fileName;
                $this->versionsSize = $versionsSize;
@@ -51,7 +51,7 @@ class Expire implements ICommand {
 
 
        public function handle() {
-               $this->setupFS($this->user);
+               \OC_Util::setupFS($this->user);
                Storage::expire($this->fileName, $this->versionsSize, $this->neededSpace);
        }
 }

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 34ed812f4bbde8244fd8dc350fb3646bb1fe36c1..3cf8522916a8f9bbfaa9b8fb80e875a315670a0f 100644 (file)
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -483,7 +483,7 @@ class Storage {
         * @param int $neededSpace
         */
        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);
        }