wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not repeat JSON success code.

Browse source
This commit is contained in:
Andreas Fischer 2013-08-08 21:27:59 +02:00
parent 0718c92dc8
commit 1ed049a682
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/files/ajax/newfile.php
View file

@ -76,14 +76,14 @@ if($source) {
$eventSource->close();
exit();
} else {
$success = false;
if($content) {
if(\OC\Files\Filesystem::file_put_contents($target, $content)) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
$id = $meta['fileid'];
OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
exit();
}
}elseif(\OC\Files\Filesystem::touch($target)) {
$success = \OC\Files\Filesystem::file_put_contents($target, $content);
} else {
$success = \OC\Files\Filesystem::touch($target);
}
if($success) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
$id = $meta['fileid'];
OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
@ -91,5 +91,4 @@ if($source) {
}
}
OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" )));