diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-13 21:59:16 +0200 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-13 21:59:16 +0200 |
| commit | a01d10e57db1893939d0a7706fad239df537e24b (patch) | |
| tree | 3649dab6d0006981225f88574b26447f9fbeac1f /apps | |
| parent | 4cbae823eb742fac80288c6c74acba26e0a9c5d6 (diff) | |
| parent | db2fb38746bb9d89b402c3a768a247945d813989 (diff) | |
| download | nextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.tar.gz nextcloud-server-a01d10e57db1893939d0a7706fad239df537e24b.zip | |
Merge branch 'master' into calendar
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/remoteStorage/compat.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/remoteStorage/compat.php b/apps/remoteStorage/compat.php index 35a133c43c7..445257320c6 100644 --- a/apps/remoteStorage/compat.php +++ b/apps/remoteStorage/compat.php @@ -101,7 +101,7 @@ if(count($pathParts) >= 8 && $pathParts[0] == '' && $pathParts[2] == 'remoteStor $token=OC_remoteStorage::createDataScope($appUrl, $userAddress, $dataScope); header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=remoteStorage'); } else { - if($_SERVER['HTTPS']){ + if((isset($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'])) { $url = "https://"; } else { $url = "http://"; |