Upgrade to 3.9.8

getkirby · Nov 14, 2023 · f96b96a · f96b96a
1 parent 474ecd1
commit f96b96a
Show file tree

Hide file tree

Showing 53 changed files with 1,383 additions and 943 deletions.
diff --git a/kirby/composer.json b/kirby/composer.json
@@ -3,7 +3,7 @@
 	"description": "The Kirby 3 core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "3.9.7",
+	"version": "3.9.8",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -38,14 +38,14 @@
 		"ext-openssl": "*",
 		"claviska/simpleimage": "4.0.6",
 		"composer/semver": "3.4.0",
-		"filp/whoops": "2.15.3",
+		"filp/whoops": "2.15.4",
 		"getkirby/composer-installer": "^1.2.1",
 		"laminas/laminas-escaper": "2.12.0",
 		"michelf/php-smartypants": "1.8.1",
 		"phpmailer/phpmailer": "6.8.1",
 		"symfony/polyfill-intl-idn": "1.28.0",
 		"symfony/polyfill-mbstring": "1.28.0",
-		"symfony/yaml": "5.4.23"
+		"symfony/yaml": "5.4.30"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"
@@ -57,6 +57,7 @@
 		"ext-fileinfo": "Improved mime type detection for files",
 		"ext-intl": "Improved i18n number formatting",
 		"ext-memcached": "Support for the Memcached cache driver",
+		"ext-sodium": "Support for the crypto class and more robust session handling",
 		"ext-zip": "Support for ZIP archive file functions",
 		"ext-zlib": "Sanitization and validation for svgz files"
 	},

diff --git a/kirby/composer.lock b/kirby/composer.lock
diff --git a/kirby/config/areas/site/dialogs.php b/kirby/config/areas/site/dialogs.php
@@ -479,6 +479,26 @@
 				];
 			}
 
+			$slugAppendix  = Str::slug(I18n::translate('page.duplicate.appendix'));
+			$titleAppendix = I18n::translate('page.duplicate.appendix');
+
+			// if the item to be duplicated already exists
+			// add a suffix at the end of slug and title
+			$duplicateSlug = $page->slug() . '-' . $slugAppendix;
+			$siblingKeys   = $page->parentModel()->childrenAndDrafts()->pluck('uid');
+
+			if (in_array($duplicateSlug, $siblingKeys) === true) {
+				$suffixCounter = 2;
+				$newSlug       = $duplicateSlug . $suffixCounter;
+
+				while (in_array($newSlug, $siblingKeys) === true) {
+					$newSlug = $duplicateSlug . ++$suffixCounter;
+				}
+
+				$slugAppendix  .= $suffixCounter;
+				$titleAppendix .= ' ' . $suffixCounter;
+			}
+
 			return [
 				'component' => 'k-form-dialog',
 				'props' => [
@@ -487,8 +507,8 @@
 					'value' => [
 						'children' => false,
 						'files'    => false,
-						'slug'     => $page->slug() . '-' . Str::slug(I18n::translate('page.duplicate.appendix')),
-						'title'    => $page->title() . ' ' . I18n::translate('page.duplicate.appendix')
+						'slug'     => $page->slug() . '-' . $slugAppendix,
+						'title'    => $page->title() . ' ' . $titleAppendix
 					]
 				]
 			];

diff --git a/kirby/config/components.php b/kirby/config/components.php
@@ -186,7 +186,7 @@
 		}
 
 		$query   = Str::lower($query);
-		$preg    = '!(' . implode('|', $words) . ')!i';
+		$preg    = '!(' . implode('|', $words) . ')!iu';
 		$scores  = [];
 
 		$results = $collection->filter(function ($item) use ($query, $exact, $preg, $options, &$scores) {
@@ -236,7 +236,7 @@
 					$scoring['hits']  += 1;
 
 				// check for exact query matches
-				} elseif ($matches = preg_match_all('!' . $exact . '!i', $value, $r)) {
+				} elseif ($matches = preg_match_all('!' . $exact . '!ui', $value, $r)) {
 					$scoring['score'] += 2 * $score;
 					$scoring['hits']  += $matches;
 				}

diff --git a/kirby/config/fields/date.php b/kirby/config/fields/date.php
@@ -129,7 +129,7 @@
 					'key' => 'validation.date.between',
 					'data' => [
 						'min' => $min->format($format),
-						'max' => $min->format($format)
+						'max' => $max->format($format)
 					]
 				]);
 			} elseif ($min && $value->isMin($min) === false) {