diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
| commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
| tree | 337b12362333030e0ebda37acb7f25073723a7af /lib/request.php | |
| parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
| parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
| download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip | |
merge master into filesystem
Diffstat (limited to 'lib/request.php')
| -rwxr-xr-x | lib/request.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/request.php b/lib/request.php index 99a77e1b59e..f2f15c21103 100755 --- a/lib/request.php +++ b/lib/request.php @@ -19,7 +19,7 @@ class OC_Request { return 'localhost'; } if(OC_Config::getValue('overwritehost', '')<>'') { - return OC_Config::getValue('overwritehost'); + return OC_Config::getValue('overwritehost'); } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) { @@ -44,7 +44,7 @@ class OC_Request { */ public static function serverProtocol() { if(OC_Config::getValue('overwriteprotocol', '')<>'') { - return OC_Config::getValue('overwriteprotocol'); + return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { $proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']); |