Merge pull request #6330 from getkirby/release/4.1.2

4.1.2

.github/workflows/backend.yml

@@ -79,7 +79,7 @@ jobs:
 
       - name: Setup PHP cache environment
         id: ext-cache
-        uses: shivammathur/cache-extensions@a167dc27e7329e600b4fffbbbc8b01b9221ab923 # pin@v1
+        uses: shivammathur/cache-extensions@f9643262bed1015eb7bfad95e63378b23bc2d319 # pin@v1
         with:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
@@ -179,7 +179,7 @@ jobs:
 
       - name: Setup PHP cache environment
         id: ext-cache
-        uses: shivammathur/cache-extensions@a167dc27e7329e600b4fffbbbc8b01b9221ab923 # pin@v1
+        uses: shivammathur/cache-extensions@f9643262bed1015eb7bfad95e63378b23bc2d319 # pin@v1
         with:
           php-version: ${{ env.php }}
           extensions: ${{ env.extensions }}

composer.json

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

config/helpers.php

@@ -109,7 +109,7 @@ function deprecated(string $message): bool
 	}
 }
 
-if (Helpers::hasOverride('dump') === false) { // @codeCoverageIgnore
+if (Helpers::hasOverride('dump') === false && function_exists('dump') === false) { // @codeCoverageIgnore
 	/**
 	 * Simple object and variable dumper
 	 * to help with debugging.

config/methods.php

@@ -148,7 +148,7 @@
 			$files  = new Files([]);
 
 			foreach ($field->toData($separator) as $id) {
-				if ($file = $parent->kirby()->file($id, $parent)) {
+				if (is_string($id) === true && $file = $parent->kirby()->file($id, $parent)) {
 					$files->add($file);
 				}
 			}
@@ -481,10 +481,9 @@
 
 				foreach ($elements as $element) {
 					foreach ($attributes as $attribute) {
-						if ($element->hasAttribute($attribute) && $url = $element->getAttribute($attribute)) {
+						if ($element->hasAttribute($attribute) && $uuid = $element->getAttribute($attribute)) {
 							try {
-								if ($uuid = Uuid::for($url)) {
-									$url = $uuid->model()?->url();
+								if ($url = Uuid::for($uuid)?->model()?->url()) {
 									$element->setAttribute($attribute, $url);
 								}
 							} catch (InvalidArgumentException) {

panel/dist/ui/Bubbles.json

@@ -1 +1 @@
-{"description":"Display a list of <k-bubble>","tags":{"since":[{"description":"3.7.0","title":"since"}],"examples":[{"title":"example","content":"<k-bubbles :bubbles=\"['Hello', 'World']\" />"}]},"displayName":"Bubbles","props":[{"name":"html","description":"If set to `true`, the `text` is rendered as HTML code,\notherwise as plain text","type":{"name":"boolean"}},{"name":"bubbles","description":"Array or string of bubbles, see <k-bubble> for available props.  If string, will be split by comma.","type":{"name":"array|string"}}],"component":"k-bubbles","sourceFile":"src/components/Layout/Bubbles.vue"}
+{"description":"Display a list of `<k-bubble>`","tags":{"since":[{"description":"3.7.0","title":"since"}],"examples":[{"title":"example","content":"<k-bubbles :bubbles=\"['Hello', 'World']\" />"}]},"displayName":"Bubbles","props":[{"name":"html","description":"If set to `true`, the `text` is rendered as HTML code,\notherwise as plain text","type":{"name":"boolean"}},{"name":"bubbles","description":"Array or string of bubbles, see `<k-bubble>` for available props.  If string, will be split by comma.","type":{"name":"array|string"}}],"component":"k-bubbles","sourceFile":"src/components/Layout/Bubbles.vue"}

panel/src/components/Dialogs/LicenseDialog.vue

@@ -16,18 +16,18 @@
 			<table style="table-layout: auto">
 				<tbody>
 					<tr>
-						<th>{{ $t("type") }}</th>
-						<td>{{ license.type }}</td>
+						<th data-mobile="true">{{ $t("type") }}</th>
+						<td data-mobile="true">{{ license.type }}</td>
 					</tr>
 					<tr v-if="license.code">
-						<th>{{ $t("license.code") }}</th>
-						<td class="k-text">
+						<th data-mobile="true">{{ $t("license.code") }}</th>
+						<td data-mobile="true" class="k-text">
 							<code>{{ license.code }}</code>
 						</td>
 					</tr>
 					<tr v-if="license.info">
-						<th>{{ $t("status") }}</th>
-						<td :data-theme="license.theme">
+						<th data-mobile="true">{{ $t("status") }}</th>
+						<td data-mobile="true" :data-theme="license.theme">
 							<p class="k-license-dialog-status">
 								<k-icon :type="license.icon" />
 								{{ license.info }}

panel/src/components/Forms/Field/ObjectField.vue

@@ -175,4 +175,14 @@ export default {
 .k-table.k-object-field-table tbody td {
 	max-width: 0;
 }
+@container (max-width: 40rem) {
+	.k-object-field {
+		overflow: hidden;
+	}
+	.k-object-field-table.k-table tbody :where(th):is([data-mobile="true"]) {
+		width: 1px !important;
+		white-space: normal;
+		word-break: normal;
+	}
+}
 </style>

panel/src/components/Forms/Toolbar/TextareaToolbar.vue

@@ -153,10 +153,13 @@ export default {
 				if (button === "|") {
 					layout.push("|");
 				} else if (available[button]) {
-					// ensure that click handler is bound to this component
-					// so that plugins can use `this.command` etc.
-					const command = available[button];
-					command.click = command.click?.bind(this);
+					const command = {
+						...available[button],
+						click: () => {
+							available[button].click?.call(this);
+						}
+					};
+
 					layout.push(command);
 				}
 			}

panel/src/components/Layout/Bubbles.vue

@@ -20,7 +20,7 @@ export const props = {
 };
 
 /**
- * Display a list of <k-bubble>
+ * Display a list of `<k-bubble>`
  * @since 3.7.0
  *
  * @example <k-bubbles :bubbles="['Hello', 'World']" />
@@ -30,7 +30,7 @@ export default {
 	inheritAttrs: false,
 	props: {
 		/**
-		 * Array or string of bubbles, see <k-bubble> for available props.  If string, will be split by comma.
+		 * Array or string of bubbles, see `<k-bubble>` for available props.  If string, will be split by comma.
 		 */
 		bubbles: [Array, String]
 	},

panel/src/components/Layout/Frame/IconFrame.vue

@@ -35,3 +35,9 @@ export default {
 	inheritAttrs: false
 };
 </script>
+
+<style>
+.k-icon-frame [data-type="emoji"] {
+	overflow: visible;
+}
+</style>

panel/src/components/Layout/Table.vue

@@ -530,7 +530,7 @@ export default {
 /* Mobile */
 @container (max-width: 40rem) {
 	.k-table {
-		overflow-x: scroll;
+		overflow-x: auto;
 	}
 	.k-table thead th {
 		position: static;

src/Http/Remote.php

@@ -59,7 +59,9 @@ public function __construct(string $url, array $options = [])
 		// use the system CA store by default if
 		// one has been configured in php.ini
 		$cainfo = ini_get('curl.cainfo');
-		if (empty($cainfo) === false && is_file($cainfo) === true) {
+
+		// Suppress warnings e.g. if system CA is outside of open_basedir (See: issue #6236)
+		if (empty($cainfo) === false && @is_file($cainfo) === true) {
 			$defaults['ca'] = self::CA_SYSTEM;
 		}
 

tests/Content/FieldMethodsTest.php

@@ -429,6 +429,20 @@ public function testPermalinksToUrls()
 		$this->assertSame('<p>This is a <a href="/a">test</a><img src="/media/pages/a/' . $hash . '/test.jpg"></p>. This should not be <a href="https://getkirby.com">affected</a>.', (string)$result);
 	}
 
+	public function testPermalinksToUrlsWithMissingUUID()
+	{
+		$app = new App([
+			'roots' => [
+				'index' => static::TMP
+			],
+		]);
+
+		$field  = $this->field('<p>This is a <a href="/@/page/my-page">test</a></p>.');
+		$result = $field->permalinksToUrls();
+
+		$this->assertSame('<p>This is a <a href="/@/page/my-page">test</a></p>.', (string)$result);
+	}
+
 	public function testToStructure()
 	{
 		$data = [

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'getkirby/cms',
-        'pretty_version' => '4.1.1',
-        'version' => '4.1.1.0',
+        'pretty_version' => '4.1.2',
+        'version' => '4.1.2.0',
         'reference' => null,
         'type' => 'kirby-cms',
         'install_path' => __DIR__ . '/../../',
@@ -47,8 +47,8 @@
             'dev_requirement' => false,
         ),
         'getkirby/cms' => array(
-            'pretty_version' => '4.1.1',
-            'version' => '4.1.1.0',
+            'pretty_version' => '4.1.2',
+            'version' => '4.1.2.0',
             'reference' => null,
             'type' => 'kirby-cms',
             'install_path' => __DIR__ . '/../../',