Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
1969c8d5
Commit
1969c8d5
authored
10 years ago
by
Robin Appelman
Browse files
Options
Downloads
Patches
Plain Diff
save uid instead of user object in command
parent
8c903c10
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/files_versions/command/expire.php
+4
-4
4 additions, 4 deletions
apps/files_versions/command/expire.php
apps/files_versions/lib/storage.php
+1
-1
1 addition, 1 deletion
apps/files_versions/lib/storage.php
with
5 additions
and
5 deletions
apps/files_versions/command/expire.php
+
4
−
4
View file @
1969c8d5
...
@@ -32,17 +32,17 @@ class Expire implements ICommand {
...
@@ -32,17 +32,17 @@ class Expire implements ICommand {
private
$neededSpace
=
0
;
private
$neededSpace
=
0
;
/**
/**
* @var in
t
* @var
str
in
g
*/
*/
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 {
...
@@ -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
);
}
}
}
}
This diff is collapsed.
Click to expand it.
apps/files_versions/lib/storage.php
+
1
−
1
View file @
1969c8d5
...
@@ -483,7 +483,7 @@ class Storage {
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment