FIX Use correct canonical tag on VirtualPage (#2688)

silverstripe · Nov 4, 2021 · 480baa6 · 480baa6
1 parent 9f7262f
commit 480baa6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/code/Model/VirtualPage.php b/code/Model/VirtualPage.php
@@ -143,9 +143,10 @@ public function MetaComponents()
         $copied = $this->CopyContentFrom();
         if ($copied && $copied->exists()) {
             $tags['canonical'] = [
+                'tag' => 'link',
                 'attributes' => [
                     'rel' => 'canonical',
-                    'content' => $copied->AbsoluteLink(),
+                    'href' => $copied->AbsoluteLink(),
                 ],
             ];
         }

diff --git a/tests/php/Model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php
@@ -7,6 +7,7 @@
 use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\CMS\Model\VirtualPage;
+use SilverStripe\Control\ContentNegotiator;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\ORM\DataObject;
@@ -93,6 +94,22 @@ public function testEditingSourcePageUpdatesVirtualPages()
         $this->assertEquals("<p>New content</p>", $vp2->Content);
     }
 
+    public function testMetaTags()
+    {
+        $this->logInWithPermission('ADMIN');
+        $master = $this->objFromFixture('Page', 'master');
+        $vp1 = $this->objFromFixture(VirtualPage::class, 'vp1');
+
+        // Test with title
+        $meta = $vp1->MetaTags();
+        $charset = Config::inst()->get(ContentNegotiator::class, 'encoding');
+        $this->assertContains('<meta http-equiv="Content-Type" content="text/html; charset='.$charset.'"', $meta);
+        $this->assertContains('<link rel="canonical" href="'.$master->AbsoluteLink().'"', $meta);
+        $this->assertContains('<meta name="x-page-id" content="'.$vp1->ID.'"', $meta);
+        $this->assertContains('<meta name="x-cms-edit-link" content="'.$vp1->CMSEditLink().'"', $meta);
+        $this->assertContains('<title>'.$master->Title.'</title>', $meta);
+    }
+
     /**
      * Test that, after you publish the source page of a virtual page, all the already published
      * virtual pages are published