diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
| commit | 946d58eaa8f93eb612a277fad1d7f870554b578e (patch) | |
| tree | 18ad2ac0c504eb283d70c040ce449b259d88f97f /lib/request.php | |
| parent | 7969d6e64617235744889df42d0e671085a779a8 (diff) | |
| parent | 6ff38624a717316d7992c81db6d4dbf8f5d86f3a (diff) | |
| download | nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.tar.gz nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.zip | |
merge master into filesystem
Diffstat (limited to 'lib/request.php')
| -rwxr-xr-x | lib/request.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/request.php b/lib/request.php index c975c84a711..99a77e1b59e 100755 --- a/lib/request.php +++ b/lib/request.php @@ -18,7 +18,7 @@ class OC_Request { if(OC::$CLI) { return 'localhost'; } - if(OC_Config::getValue('overwritehost', '')<>''){ + if(OC_Config::getValue('overwritehost', '')<>'') { return OC_Config::getValue('overwritehost'); } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { @@ -43,7 +43,7 @@ class OC_Request { * Returns the server protocol. It respects reverse proxy servers and load balancers */ public static function serverProtocol() { - if(OC_Config::getValue('overwriteprotocol', '')<>''){ + if(OC_Config::getValue('overwriteprotocol', '')<>'') { return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { @@ -74,7 +74,7 @@ class OC_Request { switch($encoding) { case 'ISO-8859-1' : - $path_info = utf8_encode($path_info); + $path_info = utf8_encode($path_info); } // end copy |