aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dav/lib/HookManager.php6
-rw-r--r--lib/base.php12
-rw-r--r--lib/private/Files/Storage/Local.php2
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php
index 1e808e58656..57b176213e0 100644
--- a/apps/dav/lib/HookManager.php
+++ b/apps/dav/lib/HookManager.php
@@ -43,7 +43,7 @@ class HookManager {
private $syncService;
/** @var IUser[] */
- private $usersToDelete;
+ private $usersToDelete = [];
/** @var CalDavBackend */
private $calDav;
@@ -52,10 +52,10 @@ class HookManager {
private $cardDav;
/** @var array */
- private $calendarsToDelete;
+ private $calendarsToDelete = [];
/** @var array */
- private $addressBooksToDelete;
+ private $addressBooksToDelete = [];
/** @var EventDispatcher */
private $eventDispatcher;
diff --git a/lib/base.php b/lib/base.php
index d0672785cef..f763ee634f3 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -417,7 +417,7 @@ class OC {
}
// prevents javascript from accessing php session cookies
- ini_set('session.cookie_httponly', true);
+ ini_set('session.cookie_httponly', 'true');
// set the cookie path to the Nextcloud directory
$cookie_path = OC::$WEBROOT ? : '/';
@@ -488,7 +488,7 @@ class OC {
*/
public static function setRequiredIniValues() {
@ini_set('default_charset', 'UTF-8');
- @ini_set('gd.jpeg_ignore_warning', 1);
+ @ini_set('gd.jpeg_ignore_warning', '1');
}
/**
@@ -620,8 +620,8 @@ class OC {
// Don't display errors and log them
error_reporting(E_ALL | E_STRICT);
- @ini_set('display_errors', 0);
- @ini_set('log_errors', 1);
+ @ini_set('display_errors', '0');
+ @ini_set('log_errors', '1');
if(!date_default_timezone_set('UTC')) {
throw new \RuntimeException('Could not set timezone to UTC');
@@ -635,8 +635,8 @@ class OC {
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@set_time_limit(3600);
}
- @ini_set('max_execution_time', 3600);
- @ini_set('max_input_time', 3600);
+ @ini_set('max_execution_time', '3600');
+ @ini_set('max_input_time', '3600');
//try to set the maximum filesize to 10G
@ini_set('upload_max_filesize', '10G');
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 731481d4f4f..ba9b15ce931 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -180,7 +180,7 @@ class Local extends \OC\Files\Storage\Common {
public function filemtime($path) {
$fullPath = $this->getSourcePath($path);
- clearstatcache($fullPath);
+ clearstatcache(true, $fullPath);
if (!$this->file_exists($path)) {
return false;
}