diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:16:46 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:16:46 +0200 |
| commit | 7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77 (patch) | |
| tree | e9cf72f3d6813d564baa9c286d0461afd0a27b34 /lib/helper.php | |
| parent | 707bd68bb4e77b4184b578699d508750653e2d42 (diff) | |
| parent | ab944094e2c0c9d063cc363a81dbe517c259a466 (diff) | |
| download | nextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.tar.gz nextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.zip | |
merge master into filesystem
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/helper.php b/lib/helper.php index 55db1c73e1c..1951a742a21 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -350,8 +350,8 @@ class OC_Helper { if(strpos($path,'.')) { //try to guess the type by the file extension - if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')) { - self::$mimetypes=include('mimetypes.list.php'); + if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') { + self::$mimetypes=include 'mimetypes.list.php'; } $extension=strtolower(strrchr(basename($path), ".")); $extension=substr($extension,1);//remove leading . |