Upgrade to 3.1.2

kirby/config/api/models/Page.php

@@ -27,7 +27,7 @@ return [
             return $page->errors();
         },
         'files' => function (Page $page) {
-            return $page->files();
+            return $page->files()->sortBy('sort', 'asc');
         },
         'hasChildren' => function (Page $page) {
             return $page->hasChildren();

kirby/config/api/models/Site.php

@@ -20,8 +20,11 @@ return [
         'content' => function (Site $site) {
             return Form::for($site)->values();
         },
+        'drafts' => function (Site $site) {
+            return $site->drafts();
+        },
         'files' => function (Site $site) {
-            return $site->files();
+            return $site->files()->sortBy('sort', 'asc');
         },
         'options' => function (Site $site) {
             return $site->permissions()->toArray();

kirby/config/api/models/User.php

@@ -23,6 +23,9 @@ return [
         'email' => function (User $user) {
             return $user->email();
         },
+        'files' => function (User $user) {
+            return $user->files()->sortBy('sort', 'asc');
+        },
         'id' => function (User $user) {
             return $user->id();
         },

kirby/config/api/routes/files.php

@@ -29,7 +29,7 @@ return [
         'pattern' => '(:all)/files',
         'method'  => 'GET',
         'action'  => function (string $path) {
-            return $this->parent($path)->files();
+            return $this->parent($path)->files()->sortBy('sort', 'asc');
         }
     ],
     [
@@ -62,7 +62,10 @@ return [
         'pattern' => '(:all)/files/sort',
         'method'  => 'PATCH',
         'action'  => function (string $path) {
-            return $this->parent($path)->files()->changeSort($this->requestBody('files'));
+            return $this->parent($path)->files()->changeSort(
+                $this->requestBody('files'),
+                $this->requestBody('index')
+            );
         }
     ],
     [