Merge branch 'develop-patch' into develop-minor

Author: distantnative

config/components.php

@@ -399,13 +399,21 @@
 
 			if ($parts[0] ?? null) {
 				$page = $kirby->site()->find($parts[0]);
+
+				// get the extension of the url, if there is one, to add it back later
+				$extension = F::extension($parts[0]);
 			} else {
 				$page = $kirby->site()->page();
 			}
 
 			if ($page) {
 				$path = $page->url($language);
 
+				// add the extension back to the url, if there was one
+				if (isset($extension) === true && $extension !== '') {
+					$path .= '.' . $extension;
+				}
+
 				if (isset($parts[1]) === true) {
 					$path .= '#' . $parts[1];
 				}

tests/Cms/App/AppComponentsTest.php

@@ -384,6 +384,57 @@ public function testTemplate(): void
 		$this->assertInstanceOf(Template::class, $this->app->template('default'));
 	}
 
+	public function testUrlPreservesExtensionOnMultilangSite(): void
+	{
+		$this->app->clone([
+			'urls' => [
+				'index' => 'https://getkirby.com'
+			],
+			'languages' => [
+				[
+					'code'    => 'en',
+					'name'    => 'English',
+					'default' => true,
+					'url'     => '/'
+				],
+				[
+					'code'    => 'de',
+					'name'    => 'Deutsch',
+					'url'     => '/de'
+				]
+			],
+			'site' => [
+				'children' => [
+					['slug' => 'articles']
+				]
+			]
+		]);
+
+		// extension is preserved for the default language
+		$this->assertSame(
+			'https://getkirby.com/articles.xml',
+			url('articles.xml')
+		);
+
+		// extension is preserved for a secondary language
+		$this->assertSame(
+			'https://getkirby.com/de/articles.xml',
+			url('articles.xml', 'de')
+		);
+
+		// works without extension as before
+		$this->assertSame(
+			'https://getkirby.com/articles',
+			url('articles')
+		);
+
+		// fragment is still appended correctly alongside the extension
+		$this->assertSame(
+			'https://getkirby.com/articles.xml#section',
+			url('articles.xml#section')
+		);
+	}
+
 	public function testUrlPlugin(): void
 	{
 		$this->app->clone([