diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-29 17:47:33 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-29 17:47:33 +0100 |
| commit | e1e4c7c21445d28986c23adf74e67c1c75960ef7 (patch) | |
| tree | 995aec58f32843cf4f4e6d3813d5babbb8978250 /lib/private/files/cache | |
| parent | 0d7d396d8013d77027d50a6c54350690416d344c (diff) | |
| parent | e08f38f99babcd16701583e789838ccd9376401a (diff) | |
| download | nextcloud-server-e1e4c7c21445d28986c23adf74e67c1c75960ef7.tar.gz nextcloud-server-e1e4c7c21445d28986c23adf74e67c1c75960ef7.zip | |
Merge branch 'master' into fix_file_cache_updater_master
Diffstat (limited to 'lib/private/files/cache')
| -rw-r--r-- | lib/private/files/cache/cache.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index fc2d965d7f9..c1e5b34c8aa 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -64,6 +64,10 @@ class Cache { * @return int */ public function getMimetypeId($mime) { + if (empty($mime)) { + // Can not insert empty string into Oracle NOT NULL column. + $mime = 'application/octet-stream'; + } if (empty(self::$mimetypeIds)) { $this->loadMimetypes(); } |