Fix Url:to with link anchors #2280

getkirby · Dec 15, 2019 · 5174c54 · 5174c54
1 parent c94664c
commit 5174c54
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/config/routes.php b/config/routes.php
@@ -5,8 +5,6 @@
 use Kirby\Cms\Panel;
 use Kirby\Cms\PanelPlugins;
 use Kirby\Cms\PluginAssets;
-use Kirby\Http\Response\Redirect;
-use Kirby\Http\Router\Route;
 use Kirby\Toolkit\Str;
 
 return function ($kirby) {

diff --git a/src/Cms/Url.php b/src/Cms/Url.php
@@ -3,6 +3,8 @@
 namespace Kirby\Cms;
 
 use Kirby\Http\Url as BaseUrl;
+use Kirby\Toolkit\Str;
+
 
 /**
  * The `Url` class extends the
@@ -76,8 +78,16 @@ public static function to(string $path = null, $options = null): string
         }
 
         // get a language url for the linked page, if the page can be found
-        if ($kirby->multilang() === true && $page = page($path)) {
-            $path = $page->url($language);
+        if ($kirby->multilang() === true) {
+            $parts = Str::split($path, '#');
+
+            if ($page = page($parts[0] ?? null)) {
+                $path = $page->url($language);
+
+                if (isset($parts[1]) === true) {
+                    $path .= '#' . $parts[1];
+                }
+            }
         }
 
         return $kirby->component('url')($kirby, $path, $options, function (string $path = null, $options = null) {

diff --git a/tests/Cms/KirbyText/KirbyTagsTest.php b/tests/Cms/KirbyText/KirbyTagsTest.php
@@ -251,6 +251,36 @@ public function testLinkWithLangAttribute()
         $this->assertEquals('<a href="https://getkirby.com/de/a">getkirby.com/de/a</a>', $app->kirbytags('(link: a lang: de)'));
     }
 
+    public function testLinkWithHash()
+    {
+        $app = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ],
+            'urls' => [
+                'index' => 'https://getkirby.com'
+            ],
+            'languages' => [
+                'en' => [
+                    'code' => 'en'
+                ],
+                'de' => [
+                    'code' => 'de'
+                ]
+            ],
+            'site' => [
+                'children' => [
+                    ['slug' => 'a']
+                ]
+            ]
+        ]);
+
+        $this->assertEquals('<a href="https://getkirby.com/en/a">getkirby.com/en/a</a>', $app->kirbytags('(link: a)'));
+        $this->assertEquals('<a href="https://getkirby.com/de/a">getkirby.com/de/a</a>', $app->kirbytags('(link: a lang: de)'));
+        $this->assertEquals('<a href="https://getkirby.com/en/a#anchor">getkirby.com/en/a</a>', $app->kirbytags('(link: a#anchor lang: en)'));
+        $this->assertEquals('<a href="https://getkirby.com/de/a#anchor">getkirby.com/de/a</a>', $app->kirbytags('(link: a#anchor lang: de)'));
+    }
+
     public function testHooks()
     {
         $app = new App([