Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 07:15:27 +02:00
Code Issues Packages Projects Releases Activity

Avoid setting empty metadata

Browse Source
This commit is contained in:
Flavio Copes
2016-01-09 23:34:31 +01:00
parent 9a3005e3c5
commit dfee5fdea9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
system/src/Grav/Common/Page/Page.php
View File

@@ -1152,11 +1152,12 @@ class Page
$this->metadata = [];
$metadata = [];
// Set the Generator tag
$this->metadata['generator'] = array('name'=>'generator', 'content'=>'GravCMS');
$metadata['generator'] = array('name'=>'generator', 'content'=>'GravCMS');
// Get initial metadata for the page
$metadata = self::getGrav()['config']->get('site.metadata');
$metadata = array_merge($metadata, self::getGrav()['config']->get('site.metadata'));
if (isset($this->header->metadata)) {
// Merge any site.metadata settings in with page metadata
@@ -1173,12 +1174,15 @@ class Page
}
// If it this is a standard meta data type
} else {
if (in_array($key, $header_tag_http_equivs)) {
$this->metadata[$key] = array('http_equiv'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES));
} else {
$this->metadata[$key] = array('name'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES));
if ($value) {
if (in_array($key, $header_tag_http_equivs)) {
$this->metadata[$key] = array('http_equiv'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES));
} else {
$this->metadata[$key] = array('name'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES));
}
}
}
}
}