diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-08 21:20:22 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-08 21:20:22 +0400 |
| commit | 3569bbe63796ca09d4b2600c171b42809b9d716c (patch) | |
| tree | 22e5a0e7b544a480cba8ad7cf0520e0db5a7fd7c | |
| parent | a6b8c5231cd1d654af964d77f4e6c923143b4893 (diff) | |
| parent | d63cd307975ade375685d41b718ca5d8bf3d18f9 (diff) | |
Merge pull request #4361 from ringmaster/fix_4355
Send mime-type for new files
| -rw-r--r-- | apps/files/ajax/newfile.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 38714f34a63..a68716f5db3 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -79,13 +79,15 @@ if($source) { if(\OC\Files\Filesystem::file_put_contents($dir.'/'.$filename, $content)) { $meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename); $id = $meta['fileid']; - OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); + $mime = $meta['mimetype']; + OCP\JSON::success(array("data" => array('mime'=>$mime, 'content'=>$content, 'id' => $id))); exit(); } }elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) { $meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename); $id = $meta['fileid']; - OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); + $mime = $meta['mimetype']; + OCP\JSON::success(array("data" => array('mime'=>$mime, 'content'=>$content, 'id' => $id))); exit(); } } |