Preparse any associated page yaml data

kolber · Apr 17, 2013 · 13baf75 · 13baf75
1 parent f62928f
commit 13baf75
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/asset-types/asset-factory.inc.php b/app/asset-types/asset-factory.inc.php
@@ -13,7 +13,7 @@ static function extract_page_data($asset_path) {
 
     # return any page data scoped against the asset filename
     $page_data = self::get($page_path);
-    return isset($page_data[strtolower($file_name)]) ? $page_data[strtolower($file_name)] : false;
+    return isset($page_data[strtolower($file_name)]) ? $page_data[strtolower($file_name)] : array();
   }
 
   static function &create($file_path) {
@@ -42,7 +42,10 @@ static function &create($file_path) {
       $page_data = self::extract_page_data($file_path);
       # create a new asset and return its data
       $asset = new $asset($file_path);
-      $merged_data = array_merge($asset->data, is_array($page_data) ? $page_data : array());
+      # Parse the page data
+      $page_data = PageData::parse_vars($page_data, true, "");
+      # Merge original data with associated page data
+      $merged_data = array_merge($asset->data, $page_data);
       return $merged_data;
 
     } else {
@@ -71,4 +74,4 @@ static function get_asset_subclasses() {
 
 }
 
-?>
+?>