diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 11:55:20 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-22 11:55:20 +0200 |
commit | 840e96cda39b97dc0c42b52946f0e98c62df3bf4 (patch) | |
tree | f8d8961af7b96b013289d7a0c1018ee40a996aea /settings/admin.php | |
parent | 934f2e94a30e21bbd0c87f347bb05de3437f66db (diff) | |
parent | 342a54bf7b31fe21362bac59cfa80a5d30ce9362 (diff) | |
download | nextcloud-server-840e96cda39b97dc0c42b52946f0e98c62df3bf4.tar.gz nextcloud-server-840e96cda39b97dc0c42b52946f0e98c62df3bf4.zip |
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
Diffstat (limited to 'settings/admin.php')
-rwxr-xr-x | settings/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php index cc30c70d474..10e239204f2 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -32,7 +32,7 @@ $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundj $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); // Check if connected using HTTPS -if (OC_Request::serverProtocol() == 'https') { +if (OC_Request::serverProtocol() === 'https') { $connectedHTTPS = true; } else { $connectedHTTPS = false; |