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

Went to simplified array rather than metadata object

Browse Source
This commit is contained in:
Andy Miller
2014-09-15 17:46:55 -06:00
parent 5b2aa6ead9
commit c50cba64bb
2 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
system/src/Grav/Common/Data/Metadata.php
View File

@@ -1,28 +0,0 @@
<?php
namespace Grav\Common\Data;
/**
* Metadata storage object
*
* @author RocketTheme
* @license MIT
*/
class MetaData
{
public $charset;
public $name;
public $property;
public $content;
public $http_equiv;
public function __construct($name = null, $content = null)
{
if ($name) {
$this->name = $name;
}
if ($content) {
$this->content = $content;
}
}
}

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

@@ -718,7 +718,7 @@ class Page
// Set the Generator tag
$this->metadata['generator'] = new Data\Metadata('generator', 'Grav ' . GRAV_VERSION);
$this->metadata['generator'] = array('name'=>'generator', 'content'=>'Grav ' . GRAV_VERSION);
// Merge any site.metadata settings in with page metadata
$defaults = (array) self::$grav['config']->get('site.metadata');
@@ -734,22 +734,16 @@ class Page
// If this is a property type metadata: "og", "twitter", "facebook" etc
if (is_array($value)) {
foreach ($value as $property => $prop_value) {
$meta = new Data\Metadata();
$prop_key = $key.":".$property;
$meta->property = $prop_key;
$meta->content = $prop_value;
$this->metadata[$prop_key] = $meta;
$this->metadata[$prop_key] = array('property'=>$prop_key, 'content'=>$prop_value);
}
// If it this is a standard meta data type
} else {
$meta = new Data\Metadata();
if (in_array($key, $header_tag_http_equivs)) {
$meta->http_equiv = $key;
$this->metadata[$key] = array('http_equiv'=>$key, 'content'=>$value);
} else {
$meta->name = $key;
$this->metadata[$key] = array('name'=>$key, 'content'=>$value);
}
$meta->content = $value;
$this->metadata[$key] = $meta;
}
}
}