diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:42:37 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 15:51:44 +0200 |
| commit | 5eba5798274823fe3147a8d671ca5e15b3eb7843 (patch) | |
| tree | eb9cfb3fc687b8be26dde07a08fd23ca3455991f /lib/request.php | |
| parent | b483f2aab856e3324026588a9702043072fd7ad2 (diff) | |
| parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
| download | nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.tar.gz nextcloud-server-5eba5798274823fe3147a8d671ca5e15b3eb7843.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
Diffstat (limited to 'lib/request.php')
| -rw-r--r-- | lib/request.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/request.php b/lib/request.php index 3fe61fbddcd..87262d98625 100644 --- a/lib/request.php +++ b/lib/request.php @@ -15,7 +15,7 @@ class OC_Request { * reverse proxies */ public static function serverHost() { - if(OC::$CLI){ + if(OC::$CLI) { return 'localhost'; } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { @@ -49,7 +49,7 @@ class OC_Request { $proto = 'http'; } } - return($proto); + return $proto; } /** @@ -57,7 +57,7 @@ class OC_Request { * @returns string Path info or false when not found */ public static function getPathInfo() { - if (array_key_exists('PATH_INFO', $_SERVER)){ + if (array_key_exists('PATH_INFO', $_SERVER)) { $path_info = $_SERVER['PATH_INFO']; }else{ $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); |