From f48a05e247d09a732ffccda9b30ddb8fb1e5ad4c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 9 Jan 2015 13:26:18 -0700
Subject: [PATCH] Added custom header. query type with default support

---
 system/src/Grav/Common/Page/Header.php | 11 +++++++++++
 system/src/Grav/Common/Page/Pages.php  | 21 ++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 system/src/Grav/Common/Page/Header.php

diff --git a/system/src/Grav/Common/Page/Header.php b/system/src/Grav/Common/Page/Header.php
new file mode 100644
index 000000000..4be82629d
--- /dev/null
+++ b/system/src/Grav/Common/Page/Header.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Grav\Common\Page;
+
+use RocketTheme\Toolbox\ArrayTraits\Constructor;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccess;
+
+class Header implements \ArrayAccess
+{
+    use NestedArrayAccess, Constructor;
+}
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index b6a44c766..0f8c0f4ac 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -597,6 +597,16 @@ class Pages
     protected function buildSort($path, array $pages, $order_by = 'default', $manual = null)
     {
         $list = array();
+        $header_default = null;
+        $header_query = null;
+
+        // do this headery query work only once
+        if (strpos($order_by, 'header.') === 0) {
+            $header_query = explode('|', str_replace('header.', '', $order_by));
+            if (isset($header_query[1])) {
+                $header_default = $header_query[1];
+            }
+        }
 
         foreach ($pages as $key => $info) {
 
@@ -616,11 +626,20 @@ class Pages
                     $list[$key] = $child->modified();
                     break;
                 case 'slug':
-                    $list[$key] = $info['slug'];
+                    $list[$key] = $child->slug();
                     break;
                 case 'basename':
                     $list[$key] = basename($key);
                     break;
+                case (is_string($header_query[0])):
+                    $child_header = new Header((array)$child->header());
+                    $header_value = $child_header->get($header_query[0]);
+                    if ($header_value) {
+                        $list[$key] = $header_value;
+                    } else {
+                        $list[$key] = $header_default ?: $key;
+                    }
+                    break;
                 case 'manual':
                 case 'default':
                 default: