summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2023-04-13 18:56:03 +0200
committerGitHub <noreply@github.com>2023-04-13 18:56:03 +0200
commit3d0cfd1f2d8c2dee9d561288f1036473c988be62 (patch)
tree5bc45ab5ce1b3e5cacb66d6c6eed1e3f7c52af42
parent6b6c00a30492911657b3ed1592b9222167d903b5 (diff)
downloadnextcloud-server-3d0cfd1f2d8c2dee9d561288f1036473c988be62.tar.gz
nextcloud-server-3d0cfd1f2d8c2dee9d561288f1036473c988be62.zip
Revert "[stable26] handle not being able to write file for notify self-test"
-rw-r--r--apps/files_external/lib/Command/Notify.php5
-rw-r--r--lib/private/Files/Storage/Common.php3
2 files changed, 1 insertions, 7 deletions
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php
index 5013d88539b..60639f7dbe4 100644
--- a/apps/files_external/lib/Command/Notify.php
+++ b/apps/files_external/lib/Command/Notify.php
@@ -326,10 +326,7 @@ class Notify extends Base {
private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, OutputInterface $output) {
usleep(100 * 1000); //give time for the notify to start
- if (!$storage->file_put_contents('/.nc_test_file.txt', 'test content')) {
- $output->writeln("Failed to create test file for self-test");
- return;
- }
+ $storage->file_put_contents('/.nc_test_file.txt', 'test content');
$storage->mkdir('/.nc_test_folder');
$storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 23f63dee264..3473eebc4a0 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -207,9 +207,6 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
public function file_put_contents($path, $data) {
$handle = $this->fopen($path, "w");
- if (!$handle) {
- return false;
- }
$this->removeCachedFile($path);
$count = fwrite($handle, $data);
fclose($handle);