From 46929a1e4bbf92d992263405d01890bf000f7311 Mon Sep 17 00:00:00 2001
From: Juned Kazi <junedkazi@users.noreply.github.com>
Date: Fri, 5 May 2017 11:12:38 -0700
Subject: [PATCH] Revert "Category sidebar display & copyright year in footer"

---
 templates/components/common/footer.html | 5 ++++-
 templates/pages/category.html           | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/components/common/footer.html b/templates/components/common/footer.html
index 56290a3f48..73d13087a0 100644
--- a/templates/components/common/footer.html
+++ b/templates/components/common/footer.html
@@ -83,8 +83,11 @@ <h5 class="footer-info-heading">{{lang 'footer.info'}}</h5>
         {{/if}}
         {{#if theme_settings.show_copyright_footer}}
             <div class="footer-copyright">
-                <p class="powered-by">&copy; {{moment format="YYYY"}} {{settings.store_name}} </p>
+                <p class="powered-by">&copy; <span id="copyright_year"></span> {{settings.store_name}} </p>
             </div>
+            <script type="text/javascript">
+                document.getElementById("copyright_year").innerHTML = new Date().getFullYear();
+            </script>
         {{/if}}
     </div>
 </footer>
diff --git a/templates/pages/category.html b/templates/pages/category.html
index ce2b3f025b..04640f97b8 100644
--- a/templates/pages/category.html
+++ b/templates/pages/category.html
@@ -24,11 +24,9 @@ <h1 class="page-heading">{{category.name}}</h1>
 {{{category.description}}}
 {{{snippet 'categories'}}}
 <div class="page">
-    {{#or category.subcategories category.faceted_search_enabled}}
-        <aside class="page-sidebar" id="faceted-search-container">
-            {{> components/category/sidebar}}
-        </aside>
-    {{/or}}
+    <aside class="page-sidebar" id="faceted-search-container">
+        {{> components/category/sidebar}}
+    </aside>
 
     <main class="page-content" id="product-listing-container">
         {{#if category.products}}