Merge pull request #4792 from getkirby/release/3.8.1

3.8.1

.tx/config

@@ -1,10 +1,10 @@
 [main]
 host = https://www.transifex.com
 
-[panel.v3]
-file_filter = i18n/translations/<lang>.json
+[o:getkirby:p:panel:r:v3]
+file_filter  = i18n/translations/<lang>.json
+source_file  = i18n/translations/en.json
+source_lang  = en
+type         = KEYVALUEJSON
 minimum_perc = 0
-source_file = i18n/translations/en.json
-source_lang = en
-type = KEYVALUEJSON
 

cacert.pem

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Jul 19 03:12:06 2022 GMT
+## Certificate data from Mozilla as of: Tue Oct 11 03:12:05 2022 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 9bf3799611fb58197f61d45e71ce3dc19f30e7dd73731915872ce5108a7bb066
+## SHA256: 3ff8bd209b5f2e739b9f2b96eacb694a774114685b02978257824f37ff528f71
 ##
 
 
@@ -3458,3 +3458,49 @@ zPUwHQYDVR0OBBYEFP+CMXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
 PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W
 Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3
 -----END CERTIFICATE-----
+
+Security Communication RootCA3
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
+IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
+b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
+CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
+AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
+hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
+NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
+/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
+npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
+XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
+p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
+3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
+GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
+CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
+/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
+YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
+Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
+H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
+YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
+XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
++LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
+KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
+dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
+6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
+-----END CERTIFICATE-----
+
+Security Communication ECC RootCA1
+==================================
+-----BEGIN CERTIFICATE-----
+MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYTAkpQMSUwIwYD
+VQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTZWN1cml0eSBDb21t
+dW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYxNjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTEL
+MAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNV
+BAMTIlNlY3VyaXR5IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+CnnfdldB9sELLo
+5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpKULGjQjBAMB0GA1UdDgQW
+BBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAK
+BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L
+snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e
+N9k=
+-----END CERTIFICATE-----

composer.json

@@ -3,7 +3,7 @@
 	"description": "The Kirby 3 core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "3.8.0",
+	"version": "3.8.1",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -40,9 +40,9 @@
 		"composer/semver": "3.3.2",
 		"filp/whoops": "2.14.5",
 		"getkirby/composer-installer": "^1.2.1",
-		"laminas/laminas-escaper": "2.10.0",
+		"laminas/laminas-escaper": "2.12.0",
 		"michelf/php-smartypants": "1.8.1",
-		"phpmailer/phpmailer": "6.6.4",
+		"phpmailer/phpmailer": "6.6.5",
 		"symfony/polyfill-intl-idn": "1.26.0",
 		"symfony/polyfill-mbstring": "1.26.0"
 	},

config/api/models/Page.php

@@ -29,9 +29,9 @@
 		'siblings'    => function (Page $page) {
 			if ($page->isDraft() === true) {
 				return $page->parentModel()->children()->not($page);
-			} else {
-				return $page->siblings();
 			}
+
+			return $page->siblings();
 		},
 		'slug'     => fn (Page $page) => $page->slug(),
 		'status'   => fn (Page $page) => $page->status(),

config/fields/mixins/picker.php

@@ -1,6 +1,7 @@
 <?php
 
 use Kirby\Toolkit\I18n;
+use Kirby\Toolkit\Str;
 
 return [
 	'props' => [
@@ -68,13 +69,13 @@
 		},
 
 		/**
-		 * Whether to store UUID or path in
-		 * the content file
+		 * Whether to store UUID or ID in the
+		 * content file of the model
 		 *
 		 * @param string $store 'uuid'|'id'
 		 */
 		'store' => function (string $store = 'uuid') {
-			return $store;
+			return Str::lower($store);
 		},
 
 		/**

config/fields/toggle.php

@@ -49,9 +49,9 @@
 		'value' => function () {
 			if ($this->props['value'] === null) {
 				return $this->default();
-			} else {
-				return $this->toBool($this->props['value']);
 			}
+
+			return $this->toBool($this->props['value']);
 		}
 	],
 	'methods' => [

config/helpers.php

@@ -3,10 +3,10 @@
 use Kirby\Cms\App;
 use Kirby\Cms\Helpers;
 use Kirby\Cms\Html;
+use Kirby\Cms\Response;
 use Kirby\Cms\Url;
 use Kirby\Filesystem\Asset;
 use Kirby\Filesystem\F;
-use Kirby\Http\Response;
 use Kirby\Http\Router;
 use Kirby\Toolkit\Date;
 use Kirby\Toolkit\I18n;

config/routes.php

@@ -112,7 +112,7 @@
 				// this ensures that only existing UUIDs can be queried
 				// and attackers can't force Kirby to go through the whole
 				// site index with a non-existing UUID
-				if ($model = Uuid::for($type . '://' . $id)->model(true)) {
+				if ($model = Uuid::for($type . '://' . $id)?->model(true)) {
 					return $kirby
 						->response()
 						->redirect($model->url());

i18n/translations/fi.json

@@ -259,7 +259,7 @@
 	"field.blocks.image.placeholder": "Valitse kuva",
 	"field.blocks.image.ratio": "Kuvasuhde",
 	"field.blocks.image.url": "Kuvan URL",
-	"field.blocks.line.name": "Line",
+	"field.blocks.line.name": "Rivi",
 	"field.blocks.list.name": "Lista",
 	"field.blocks.markdown.name": "Markdown",
 	"field.blocks.markdown.label": "Teksti",
@@ -284,7 +284,7 @@
 	"field.layout.empty": "Ei rivejä",
 	"field.layout.select": "Valitse asettelu",
 
-	"field.object.empty": "No information yet",
+	"field.object.empty": "Ei vielä tietoja",
 
 	"field.pages.empty": " Sivuja ei ole vielä valittu",
 
@@ -303,7 +303,7 @@
 	"hide": "Piilota",
 	"hour": "Tunti",
 	"import": "Tuo",
-	"info": "Info",
+	"info": "Tietoja",
 	"insert": "Lis\u00e4\u00e4",
 	"insert.after": "Lisää eteen",
 	"insert.before": "Lisää jälkeen",
@@ -346,12 +346,12 @@
 	"license": "Lisenssi",
 	"license.buy": "Osta lisenssi",
 	"license.register": "Rekisteröi",
-	"license.manage": "Manage your licenses",
+	"license.manage": "Hallinnoi lisenssejäsi",
 	"license.register.help": "Lisenssiavain on lähetetty oston jälkeen sähköpostiisi. Kopioi ja liitä avain tähän.",
 	"license.register.label": "Anna lisenssiavain",
 	"license.register.success": "Kiitos kun tuet Kirbyä",
 	"license.unregistered": "Tämä on rekisteröimätön demo Kirbystä",
-	"license.unregistered.label": "Unregistered",
+	"license.unregistered.label": "Rekisteröimätön",
 
 	"link": "Linkki",
 	"link.text": "Linkin teksti",
@@ -454,7 +454,7 @@
 	"paste": "Liitä",
 	"paste.after": "Liitä jälkeen",
 	"pixel": "Pikseli",
-	"plugin": "Plugin",
+	"plugin": "Liitännäinen",
 	"plugins": "Liitännäiset",
 	"prev": "Edellinen",
 	"preview": "Esikatselu",
@@ -482,7 +482,7 @@
 
 	"section.required": "Osio on pakollinen",
 
-	"security": "Security",
+	"security": "Tietoturva",
 	"select": "Valitse",
 	"server": "Palvelin",
 	"settings": "Asetukset",
@@ -492,26 +492,26 @@
 	"slug": "URL-tunniste",
 	"sort": "Järjestele",
 
-	"stats.empty": "No reports",
+	"stats.empty": "Ei raportteja",
 	"system.issues.content": "The content folder seems to be exposed",
 	"system.issues.eol.kirby": "Your installed Kirby version has reached end-of-life and will not receive further security updates",
 	"system.issues.eol.plugin": "Your installed version of the { plugin } plugin is has reached end-of-life and will not receive further security updates",
 	"system.issues.debug": "Debugging must be turned off in production",
 	"system.issues.git": "The .git folder seems to be exposed",
-	"system.issues.https": "We recommend HTTPS for all your sites",
+	"system.issues.https": "Suosittelemme HTTPS:n käyttöä kaikilla sivustoillasi",
 	"system.issues.kirby": "The kirby folder seems to be exposed",
 	"system.issues.site": "The site folder seems to be exposed",
-	"system.issues.vulnerability.kirby": "Your installation might be affected by the following vulnerability ({ severity } severity): { description }",
-	"system.issues.vulnerability.plugin": "Your installation might be affected by the following vulnerability in the { plugin } plugin ({ severity } severity): { description }",
-	"system.updateStatus": "Update status",
-	"system.updateStatus.error": "Could not check for updates",
-	"system.updateStatus.not-vulnerable": "No known vulnerabilities",
-	"system.updateStatus.security-update": "Free security update { version } available",
-	"system.updateStatus.security-upgrade": "Upgrade { version } with security fixes available",
-	"system.updateStatus.unreleased": "Unreleased version",
-	"system.updateStatus.up-to-date": "Up to date",
-	"system.updateStatus.update": "Free update { version } available",
-	"system.updateStatus.upgrade": "Upgrade { version } available",
+	"system.issues.vulnerability.kirby": "Asennuksesi voi olla altis seuraaville haavoittuvuuksille ({ severity } vakavuus): { description }",
+	"system.issues.vulnerability.plugin": "Asennuksesi käyttämä liitännäinen { plugin } voi olla altis haavoittuvuudelle ({ severity } vakavuus): { description }",
+	"system.updateStatus": "Päivitysten tilanne",
+	"system.updateStatus.error": "Päivityksiä ei voitu tarkistaa",
+	"system.updateStatus.not-vulnerable": "Ei tunnettuja haavoittuvuuksia",
+	"system.updateStatus.security-update": "Ilmainen tietoturvapäivitys { version } saatavilla",
+	"system.updateStatus.security-upgrade": "Tietoturvakorjauksia sisältävä päivitys { version } saatavilla",
+	"system.updateStatus.unreleased": "Julkaisematon versio",
+	"system.updateStatus.up-to-date": "Ajan tasalla",
+	"system.updateStatus.update": "Ilmainen päivitys { version } saatavilla",
+	"system.updateStatus.upgrade": "Päivitys { version } saatavilla",
 
 	"title": "Nimi",
 	"template": "Sivupohja",
@@ -578,9 +578,9 @@
 	"users": "Käyttäjät",
 
 	"version": "Versio",
-	"version.current": "Current version",
-	"version.latest": "Latest version",
-	"versionInformation": "Version information",
+	"version.current": "Nykyinen versio ",
+	"version.latest": "Uusin versio ",
+	"versionInformation": "Version tiedot",
 
 	"view.account": "Oma käyttäjätili",
 	"view.installation": "Asennus",