From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 15 Aug 2013 22:13:10 +0000 (+0200)
Subject: Merge branch 'master' into mimetype-defaults
X-Git-Tag: v6.0.0alpha2~302^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7279a07ca20949cf3cee82faf064d6aae8cf0a99;p=nextcloud-server.git

Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php
---

7279a07ca20949cf3cee82faf064d6aae8cf0a99
diff --cc apps/files/ajax/newfile.php
index 21db0a7834b,8c1aad8668c..8f5b1d98c3e
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@@ -75,21 -76,22 +76,28 @@@ if($source) 
  	$eventSource->close();
  	exit();
  } else {
- 	if ($content) {
- 		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)));
- 			exit();
- 		}
- 	} elseif (\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
- 		$meta = \OC\Files\Filesystem::getFileInfo($dir . '/' . $filename);
+ 	$success = false;
++	if (!$content) {
 +		$templateManager = OC_Helper::getFileTemplateManager();
- 		if ($content = $templateManager->getTemplate($meta['mimetype'])) {
- 			\OC\Files\Filesystem::file_put_contents($dir . '/' . $filename, $content);
- 		}
++		$mimeType = OC_Helper::getMimeType($target);
++		$content = $templateManager->getTemplate($mimeType);
++	}
++
+ 	if($content) {
+ 		$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'])));
+ 		$mime = $meta['mimetype'];
+ 		OCP\JSON::success(array('data' => array(
+ 			'id' => $id,
+ 			'mime' => $mime,
+ 			'content' => $content,
+ 		)));
  		exit();
  	}
  }