aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGit'Fellow <12234510+solracsf@users.noreply.github.com>2025-02-07 20:02:53 +0100
committerGitHub <noreply@github.com>2025-02-07 20:02:53 +0100
commit2f006e54dce0cd781630f7433a84b228f74ea4dc (patch)
treeeb6a9f0f9f1ef68b4218ea00773ed16ad82a7f6d
parentbca25971c70043a749f008c6cd405decdd63ab8e (diff)
downloadnextcloud-server-moveOCPClasses.tar.gz
nextcloud-server-moveOCPClasses.zip
fix: psalmmoveOCPClasses
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
-rw-r--r--apps/files_trashbin/lib/Trashbin.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 14e61585384..d79b50fcea3 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -457,7 +457,7 @@ class Trashbin implements IEventListener {
* @return bool true on success, false otherwise
*/
public static function restore($file, $filename, $timestamp) {
- $user = Server::get(IUserSession::class)->getUser();
+ $user = Server::get(IUserSession::class)->getUser()->getUID();
$view = new View('/' . $user);
$location = '';
@@ -551,7 +551,7 @@ class Trashbin implements IEventListener {
*/
private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
- $user = Server::get(IUserSession::class)->getUser();
+ $user = Server::get(IUserSession::class)->getUser()->getUID();
$rootView = new View('/');
$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
@@ -563,7 +563,7 @@ class Trashbin implements IEventListener {
return false;
}
- $versionedFile = $timestamp ? $filename : file;
+ $versionedFile = $timestamp ? $filename : $file;
if ($view->is_dir('/files_trashbin/versions/' . $file)) {
$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
@@ -582,7 +582,7 @@ class Trashbin implements IEventListener {
* delete all files from the trash
*/
public static function deleteAll() {
- $user = Server::get(IUserSession::class)->getUser();
+ $user = Server::get(IUserSession::class)->getUser()->getUID();
$rootFolder = Server::get(IRootFolder::class);
$userRoot = $rootFolder->getUserFolder($user)->getParent();
$view = new View('/' . $user);
@@ -732,7 +732,7 @@ class Trashbin implements IEventListener {
* @return bool true if file exists, otherwise false
*/
public static function file_exists($filename, $timestamp = null) {
- $user = Server::get(IUserSession::class)->getUser();
+ $user = Server::get(IUserSession::class)->getUser()->getUID();
$view = new View('/' . $user);
if ($timestamp) {