Fix KirbyText in image KirbyTag caption #1501

getkirby · May 11, 2019 · 1328a52 · 1328a52
1 parent d7cd044
commit 1328a52
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/config/tags.php b/config/tags.php
@@ -1,6 +1,5 @@
 <?php
 
-use Kirby\Cms\App;
 use Kirby\Cms\Html;
 use Kirby\Cms\Url;
 
@@ -132,6 +131,11 @@
                 return $link($image);
             }
 
+            // render KirbyText in caption
+            if ($tag->caption) {
+                $tag->caption = [$tag->kirby()->kirbytext($tag->caption, [], true)];
+            }
+
             return Html::figure([ $link($image) ], $tag->caption, [
                 'class' => $tag->class
             ]);

diff --git a/tests/Cms/KirbyTagsTest.php b/tests/Cms/KirbyTagsTest.php
@@ -80,6 +80,19 @@ public function testImageWithoutFigure()
         $this->assertEquals($expected, $kirby->kirbytext('(image: https://test.com/something.jpg)'));
     }
 
+    public function testImageWithCaption()
+    {
+        $kirby = new App([
+            'roots' => [
+                'index' => '/dev/null'
+            ]
+        ]);
+
+        $expected = '<figure><img alt="" src="/myimage.jpg"><figcaption>This is an <em>awesome</em> image and this a <a href="">link</a></figcaption></figure>';
+
+        $this->assertEquals($expected, $kirby->kirbytext('(image: myimage.jpg caption: This is an *awesome* image and this a <a href="">link</a>)'));
+    }
+
     public function testFileWithinFile()
     {
         $kirby = new App([