Merge branch 'master' into 'tsj_task'

# Conflicts:
#   module/doc/view/lefttree.html.php

module/doc/model.php

@@ -54,7 +54,7 @@ class docModel extends model
             ->andWhere('project')->eq(0)
             ->andWhere('execution')->eq(0)
             ->fi()
-            ->orderBy('`order`_asc, id_desc')
+            ->orderBy('order_asc, id_asc')
             ->fetchAll('id');
 
         $libs = array_filter($libs, array($this, 'checkPrivLib'));
@@ -834,7 +834,7 @@ class docModel extends model
         $now = helper::now();
         $doc = fixer::input('post')
             ->callFunc('title', 'trim')
-            ->setDefault('content', '')
+            ->setDefault('content,template,templateType,chapterType', '')
             ->add('addedBy', $this->app->user->account)
             ->add('addedDate', $now)
             ->add('editedBy', $this->app->user->account)
@@ -873,6 +873,7 @@ class docModel extends model
         $docContent->title   = $doc->title;
         $docContent->content = $doc->contentType == 'html' ? $doc->content : $doc->contentMarkdown;
         $docContent->type    = $doc->contentType;
+        $docContent->digest  = '';
         $docContent->version = 1;
         unset($doc->contentMarkdown, $doc->contentType, $doc->url);