Update canonical link condition (#1881)
This commit is contained in:
@@ -1015,7 +1015,7 @@ class Archive extends Contents
|
||||
$allows = self::pluginHandle()->filter('headerOptions', $allows, $this);
|
||||
$title = (empty($this->archiveTitle) ? '' : $this->archiveTitle . ' » ') . $this->options->title;
|
||||
|
||||
$header = $this->is('single') ? '<link rel="canonical" href="' . $this->archiveUrl . '" />' . "\n" : '';
|
||||
$header = ($this->is('single') && !$this->is('index')) ? '<link rel="canonical" href="' . $this->archiveUrl . '" />' . "\n" : '';
|
||||
|
||||
if (!empty($allows['pingback']) && 2 == $this->options->allowXmlRpc) {
|
||||
$header .= '<link rel="pingback" href="' . $allows['pingback'] . '" />' . "\n";
|
||||
|
||||
@@ -452,7 +452,7 @@ class Contents extends Base implements QueryInterface, RowFilterInterface, Prima
|
||||
}
|
||||
}
|
||||
|
||||
$allow &= ($this->row['allow' . ucfirst($permission)] == 1) and !$this->hidden;
|
||||
$allow &= ($this->row['allow' . ucfirst($permission)] == 1) && !$this->hidden;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user