From c50cba64bb36f2cfdd73b9e13be9f21a8115f3dd Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 15 Sep 2014 17:46:55 -0600
Subject: [PATCH] Went to simplified array rather than metadata object

---
 system/src/Grav/Common/Data/Metadata.php | 28 ------------------------
 system/src/Grav/Common/Page/Page.php     | 14 ++++--------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 system/src/Grav/Common/Data/Metadata.php

diff --git a/system/src/Grav/Common/Data/Metadata.php b/system/src/Grav/Common/Data/Metadata.php
deleted file mode 100644
index 906c900c6..000000000
--- a/system/src/Grav/Common/Data/Metadata.php
+++ /dev/null
@@ -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;
-        }
-
-    }
-}
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index d541f7f45..e36d7a72b 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -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;
                 }
             }
         }