Merge pull request #4339 from owncloud/mimetype-defaults

Add the option to provide templates for newly created files

diff --cc lib/helper.php
index 31f0f1698d55c992c58ee01bbe4c61420733a241,8b64baaea7275a993f98efcdfda23713c0a84bc0..51165193623614cb01bc27160597a0ccfefb20e8
--- 1/lib/helper.php
--- 2/lib/helper.php
+++ b/lib/helper.php
@@@ -229,20 -226,20 +226,20 @@@ class OC_Helper 
         *
         * Makes 2048 to 2 kB.
         */
-       public static function humanFileSize( $bytes ) {
-               if( $bytes < 0 ) {
+       public static function humanFileSize($bytes) {
+               if ($bytes < 0) {
                        $l = OC_L10N::get('lib');
 -                      return $l->t("couldn't be determined");
 +                      return "?";
                }
-               if( $bytes < 1024 ) {
+               if ($bytes < 1024) {
                        return "$bytes B";
                }
-               $bytes = round( $bytes / 1024, 1 );
-               if( $bytes < 1024 ) {
+               $bytes = round($bytes / 1024, 1);
+               if ($bytes < 1024) {
                        return "$bytes kB";
                }
-               $bytes = round( $bytes / 1024, 1 );
-               if( $bytes < 1024 ) {
+               $bytes = round($bytes / 1024, 1);
+               if ($bytes < 1024) {
                        return "$bytes MB";
                }