Merge branch 'develop-minor' into v5/develop

getkirby · Feb 7, 2025 · 0579bda · 0579bda
2 parents e056b2a + 4bd5592
commit 0579bda
Show file tree

Hide file tree

Showing 14 changed files with 233 additions and 758 deletions.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/composer.lock b/composer.lock
diff --git a/config/areas/languages/dialogs.php b/config/areas/languages/dialogs.php
@@ -242,12 +242,26 @@
 			$fields['key']['disabled'] = true;
 			$fields['value']['autofocus'] = true;
 
+			// shows info text when variable is an array
+			// TODO: 5.0: use entries field instead showing info text
+			$isVariableArray = is_array($variable->value()) === true;
+
+			if ($isVariableArray === true) {
+				$fields['value'] = [
+					'label' => I18n::translate('info'),
+					'type'  => 'info',
+					'text'  => 'You are using an array variable for this key. Please modify it in the language file in /site/languages',
+				];
+			}
+
 			return [
 				'component' => 'k-form-dialog',
-				'props' => [
-					'fields' => $fields,
-					'size'   => 'large',
-					'value'  => [
+				'props'     => [
+					'cancelButton' => $isVariableArray === false,
+					'fields'       => $fields,
+					'size'         => 'large',
+					'submitButton' => $isVariableArray === false,
+					'value'        => [
 						'key'   => $variable->key(),
 						'value' => $variable->value()
 					]

diff --git a/config/components.php b/config/components.php
@@ -18,6 +18,7 @@
 use Kirby\Http\Uri;
 use Kirby\Http\Url;
 use Kirby\Image\Darkroom;
+use Kirby\Session\SessionStore;
 use Kirby\Template\Snippet;
 use Kirby\Template\Template;
 use Kirby\Text\Markdown;
@@ -265,6 +266,13 @@
 		);
 	},
 
+	/**
+	 * Add your own session store
+	 */
+	'session::store' => function (App $kirby): string|SessionStore {
+		return $kirby->root('sessions');
+	},
+
 	/**
 	 * Add your own SmartyPants parser
 	 *