Merge pull request #6977 from getkirby/release/4.6.1

4.6.1

Author: bastianallgeier

composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.6.0",
+	"version": "4.6.1",
 	"keywords": [
 		"kirby",
 		"cms",

composer.lock

@@ -1 +1 @@
-{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"boolean|object"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}
+{"displayName":"FieldsSection","description":"","tags":{},"props":[{"name":"blueprint","type":{"name":"string"}},{"name":"lock","type":{"name":"object|boolean"}},{"name":"help","type":{"name":"string"}},{"name":"name","type":{"name":"string"}},{"name":"parent","type":{"name":"string"}},{"name":"timestamp","type":{"name":"number"}}],"component":"k-fields-section","sourceFile":"src/components/Sections/FieldsSection.vue"}

panel/dist/js/index.min.js

@@ -29,6 +29,9 @@ import debounce from "@/helpers/debounce.js";
 export default {
 	mixins: [SectionMixin],
 	inheritAttrs: false,
+	props: {
+		lock: [Object, Boolean]
+	},
 	data() {
 		return {
 			fields: {},

panel/dist/ui/FieldsSection.json

@@ -139,13 +139,18 @@ export default {
 		MOVE(state, [from, to]) {
 			// move state
 			const model = structuredClone(state.models[from]);
-			del(state.models, from);
 			set(state.models, to, model);
 
 			// move local storage
 			const storage = localStorage.getItem("kirby$content$" + from);
-			localStorage.removeItem("kirby$content$" + from);
 			localStorage.setItem("kirby$content$" + to, storage);
+
+			// change the context
+			state.current = to;
+
+			// delete the old state
+			localStorage.removeItem("kirby$content$" + from);
+			del(state.models, from);
 		},
 		REMOVE(state, id) {
 			del(state.models, id);

panel/src/components/Sections/FieldsSection.vue

@@ -287,7 +287,7 @@ public function send(): string
 		}
 
 		// send the content type header
-		header('Content-Type:' . $this->type() . '; charset=' . $this->charset());
+		header('Content-Type: ' . $this->type() . '; charset=' . $this->charset());
 
 		// print the response body
 		return $this->body();

panel/src/store/modules/content.js

@@ -322,6 +322,7 @@ private static function getInstalled()
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
@@ -330,9 +331,11 @@ private static function getInstalled()
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $required;
+                        $copiedLocalDir = true;
                     }
                 }
             }
@@ -350,7 +353,7 @@ private static function getInstalled()
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

src/Http/Response.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => 'getkirby/cms',
-        'pretty_version' => '4.6.0',
-        'version' => '4.6.0.0',
-        'reference' => NULL,
+        'pretty_version' => '4.6.1',
+        'version' => '4.6.1.0',
+        'reference' => null,
         'type' => 'kirby-cms',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -47,9 +47,9 @@
             'dev_requirement' => false,
         ),
         'getkirby/cms' => array(
-            'pretty_version' => '4.6.0',
-            'version' => '4.6.0.0',
-            'reference' => NULL,
+            'pretty_version' => '4.6.1',
+            'version' => '4.6.1.0',
+            'reference' => null,
             'type' => 'kirby-cms',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),