diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-11-29 16:36:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 16:36:01 +0100 |
| commit | e86ea95043c03974ac5d593e80ec5a87f70b04a2 (patch) | |
| tree | c6b44764ad41b270982676511176b275b4dc5767 | |
| parent | f9271ebbd612c42eb33fb2b74023f7f7c8c1e05f (diff) | |
| parent | 72a54ff9dee7d664de7a6866d433a5acf753edce (diff) | |
| download | nextcloud-server-e86ea95043c03974ac5d593e80ec5a87f70b04a2.tar.gz nextcloud-server-e86ea95043c03974ac5d593e80ec5a87f70b04a2.zip | |
Merge pull request #2404 from nextcloud/streamresponse-warning
prevent warning in StreamResponse
| -rw-r--r-- | lib/public/AppFramework/Http/StreamResponse.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/AppFramework/Http/StreamResponse.php b/lib/public/AppFramework/Http/StreamResponse.php index e124bb4ccbf..b3ec5577e29 100644 --- a/lib/public/AppFramework/Http/StreamResponse.php +++ b/lib/public/AppFramework/Http/StreamResponse.php @@ -54,7 +54,7 @@ class StreamResponse extends Response implements ICallbackResponse { public function callback (IOutput $output) { // handle caching if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) { - if (!(file_exists($this->filePath) || is_resource($this->filePath))) { + if (!(is_resource($this->filePath) || file_exists($this->filePath))) { $output->setHttpResponseCode(Http::STATUS_NOT_FOUND); } elseif ($output->setReadfile($this->filePath) === false) { $output->setHttpResponseCode(Http::STATUS_BAD_REQUEST); |