Skip to content

Fix strict typing issues in lib/base.php #7814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jan 12, 2018
Merged

Fix strict typing issues in lib/base.php #7814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ public static function initSession() {
}

// 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 ? : '/';
Expand Down Expand Up @@ -488,7 +488,7 @@ public static function loadAppClassPaths() {
*/
public static function setRequiredIniValues() {
@ini_set('default_charset', 'UTF-8');
@ini_set('gd.jpeg_ignore_warning', 1);
@ini_set('gd.jpeg_ignore_warning', '1');
}

/**
Expand Down Expand Up @@ -620,8 +620,8 @@ public static function init() {

// 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');
Expand All @@ -635,8 +635,8 @@ public static function init() {
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');
Expand Down