tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.8' into 4

Browse Source
This commit is contained in:
Steve Boyd 2021-05-28 13:31:52 +12:00
commit 4c8823f218
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/Model/VirtualPage.php
View File

@ -134,23 +134,22 @@ class VirtualPage extends Page
}
/**
* For VirtualPage, add a canonical link tag linking to the original page
* See TRAC #6828 & http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394
*
* @param boolean $includeTitle Show default <title>-tag, set to false for custom templating
* @return string The XHTML metatags
* @return array
*/
public function MetaTags($includeTitle = true)
public function MetaComponents()
{
$tags = parent::MetaTags($includeTitle);
$tags = parent::MetaComponents();
$copied = $this->CopyContentFrom();
if ($copied && $copied->exists()) {
$tags .= HTML::createTag('link', [
'rel' => 'canonical',
'href' => $copied->Link()
]);
$tags .= "\n";
$tags['canonical'] = [
'attributes' => [
'rel' => 'canonical',
'content' => $copied->AbsoluteLink(),
],
];
}
return $tags;
}