From 5eb6060435c5bc8885c82b5e597cd98100bc9d5a Mon Sep 17 00:00:00 2001
From: Frederick Lawler <fred@fredlawl.com>
Date: Sat, 26 Apr 2014 09:09:27 -0500
Subject: [PATCH 1/3] Fixed fatal errors caused by the missing "query" field in
 layout_page

---
 src/GitList/Controller/TreeController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php
index 384b537..82880fd 100644
--- a/src/GitList/Controller/TreeController.php
+++ b/src/GitList/Controller/TreeController.php
@@ -42,6 +42,7 @@ class TreeController implements ControllerProviderInterface
                 'branches'       => $repository->getBranches(),
                 'tags'           => $repository->getTags(),
                 'readme'         => $app['util.repository']->getReadme($repository, $branch),
+                'query'          => ''
             ));
         })->assert('repo', $app['util.routing']->getRepositoryRegex())
           ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex())
@@ -65,6 +66,7 @@ class TreeController implements ControllerProviderInterface
                 'breadcrumbs'    => $breadcrumbs,
                 'branches'       => $repository->getBranches(),
                 'tags'           => $repository->getTags(),
+                'query'          => $query
             ));
         })->assert('repo', $app['util.routing']->getRepositoryRegex())
           ->assert('branch', $app['util.routing']->getBranchRegex())

From b48ed2ebdcb6501c7d9f747619b33bc38fea7d73 Mon Sep 17 00:00:00 2001
From: Frederick Lawler <fred@fredlawl.com>
Date: Sat, 26 Apr 2014 09:36:30 -0500
Subject: [PATCH 2/3] Added search query where needed.

---
 src/GitList/Controller/TreeController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/GitList/Controller/TreeController.php b/src/GitList/Controller/TreeController.php
index 82880fd..6e88e05 100644
--- a/src/GitList/Controller/TreeController.php
+++ b/src/GitList/Controller/TreeController.php
@@ -42,7 +42,6 @@ class TreeController implements ControllerProviderInterface
                 'branches'       => $repository->getBranches(),
                 'tags'           => $repository->getTags(),
                 'readme'         => $app['util.repository']->getReadme($repository, $branch),
-                'query'          => ''
             ));
         })->assert('repo', $app['util.routing']->getRepositoryRegex())
           ->assert('commitishPath', $app['util.routing']->getCommitishPathRegex())

From 64722427bf5849af5616184db959f5f444ea27ba Mon Sep 17 00:00:00 2001
From: Frederick Lawler <fred@fredlawl.com>
Date: Sat, 26 Apr 2014 09:36:57 -0500
Subject: [PATCH 3/3] If "query" var does not exist in request, display empty

---
 views/layout_page.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/layout_page.twig b/views/layout_page.twig
index 45665af..307fffb 100644
--- a/views/layout_page.twig
+++ b/views/layout_page.twig
@@ -8,11 +8,11 @@
             <div class="span12">
                 {% if page in ['commits', 'searchcommits'] %}
                 <form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
-                    <input type="text" name="query" class="input-medium search-query" placeholder="Search commits..." value="{{ query }}">
+                    <input type="text" name="query" class="input-medium search-query" placeholder="Search commits..." value="{{ query | default("") }}">
                 </form>
                 {% else %}
                 <form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
-                    <input type="text" name="query" class="input-medium search-query" placeholder="Search tree..." value="{{ query }}">
+                    <input type="text" name="query" class="input-medium search-query" placeholder="Search tree..." value="{{ query | default("") }}">
                 </form>
                 {% endif %}