diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
| commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
| tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/minimizer.php | |
| parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
| parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
| download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/minimizer.php')
| -rw-r--r-- | lib/minimizer.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/minimizer.php b/lib/minimizer.php index deffa8e65df..33106245963 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -48,11 +48,11 @@ abstract class OC_Minimizer { } if (!function_exists('gzdecode')) { - function gzdecode($data,$maxlength=null,&$filename='',&$error='') + function gzdecode($data, $maxlength=null, &$filename='', &$error='') { - if (strcmp(substr($data,0,9),"\x1f\x8b\x8\0\0\0\0\0\0")) { + if (strcmp(substr($data, 0, 9),"\x1f\x8b\x8\0\0\0\0\0\0")) { return null; // Not the GZIP format we expect (See RFC 1952) } - return gzinflate(substr($data,10,-8)); + return gzinflate(substr($data, 10, -8)); } } |