diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
| commit | 00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch) | |
| tree | f5d69cf10ef3fd157a21990a38515c03b74035a1 /lib/request.php | |
| parent | df8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff) | |
| parent | 8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff) | |
| download | nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip | |
merge from master
Diffstat (limited to 'lib/request.php')
| -rw-r--r-- | lib/request.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/request.php b/lib/request.php index 87262d98625..287d20d1a5d 100644 --- a/lib/request.php +++ b/lib/request.php @@ -63,7 +63,7 @@ class OC_Request { $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); // following is taken from Sabre_DAV_URLUtil::decodePathSegment $path_info = rawurldecode($path_info); - $encoding = mb_detect_encoding($path_info, array('UTF-8','ISO-8859-1')); + $encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1')); switch($encoding) { @@ -98,7 +98,7 @@ class OC_Request { $HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"]; if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false ) return 'x-gzip'; - else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false ) + else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false ) return 'gzip'; return false; } |