summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-06-29 11:06:50 +0200
committerGitHub <noreply@github.com>2017-06-29 11:06:50 +0200
commite0ef9608489b896b61c5ef9bf897a9e95a6c9906 (patch)
treefb3bc359cd828d788d63b089234a8a1bd0f46050
parent928b6a376eb6486f772e1f0304f9ac1166bbf4bb (diff)
parentb4fa812a3d5d430d10afafdcedae21e96e930de0 (diff)
downloadnextcloud-server-e0ef9608489b896b61c5ef9bf897a9e95a6c9906.tar.gz
nextcloud-server-e0ef9608489b896b61c5ef9bf897a9e95a6c9906.zip
Merge pull request #5526 from nextcloud/trashbin-error-log
Improve logging of trash bin inconsistencies
-rw-r--r--apps/files_trashbin/lib/Trashbin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 48dc3fbd055..75035b8bab6 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -386,7 +386,7 @@ class Trashbin {
if ($timestamp) {
$location = self::getLocation($user, $filename, $timestamp);
if ($location === false) {
- \OCP\Util::writeLog('files_trashbin', 'trash bin database inconsistent!', \OCP\Util::ERROR);
+ \OCP\Util::writeLog('files_trashbin', 'trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', \OCP\Util::ERROR);
} else {
// if location no longer exists, restore file in the root directory
if ($location !== '/' &&