Merge branch 'master' into mimetype-defaults

Conflicts:
	apps/files/ajax/newfile.php

diff --cc apps/files/ajax/newfile.php
index 21db0a7834b93a2822eca39d82249caf4301b489,8c1aad8668c300ccbcbc11217a7efa3eaf0ea9cd..8f5b1d98c3ebbf00a60918d6bdc44f3de2ba8cab
--- 1/apps/files/ajax/newfile.php
--- 2/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();
        }
  }