Merge branch '4.7' into 4.8

This commit is contained in:
Steve Boyd 2021-05-28 13:31:35 +12:00
commit ac35e94a19

View File

@ -134,23 +134,22 @@ class VirtualPage extends Page
} }
/** /**
* For VirtualPage, add a canonical link tag linking to the original page * @return array
* 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
*/ */
public function MetaTags($includeTitle = true) public function MetaComponents()
{ {
$tags = parent::MetaTags($includeTitle); $tags = parent::MetaComponents();
$copied = $this->CopyContentFrom(); $copied = $this->CopyContentFrom();
if ($copied && $copied->exists()) { if ($copied && $copied->exists()) {
$tags .= HTML::createTag('link', [ $tags['canonical'] = [
'attributes' => [
'rel' => 'canonical', 'rel' => 'canonical',
'href' => $copied->Link() 'content' => $copied->AbsoluteLink(),
]); ],
$tags .= "\n"; ];
} }
return $tags; return $tags;
} }