From 4e4baaa4316891e838a33ee575d1acf47cc4bd5f Mon Sep 17 00:00:00 2001
From: zuuperman <nils.destoop@gmail.com>
Date: Thu, 19 Sep 2013 17:41:48 +0200
Subject: [PATCH] Also activate metadata checks for nojs versions

---
 culturefeed_search_ui/includes/helpers.inc                 | 2 +-
 culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/culturefeed_search_ui/includes/helpers.inc b/culturefeed_search_ui/includes/helpers.inc
index f55d53e8..c3d34f09 100644
--- a/culturefeed_search_ui/includes/helpers.inc
+++ b/culturefeed_search_ui/includes/helpers.inc
@@ -45,7 +45,7 @@ function _culturefeed_search_ui_get_active_search_page() {
   foreach ($searchable_types as $key => $type) {
 
     // Check if this is the current page.
-    if ($type['path'] == $_GET['q']) {
+    if ($type['path'] == $_GET['q'] || $type['path'] . '/nojs' == $_GET['q']) {
 
       // If this page has active facets in the info definition. Check if all the facets matches.
       if (!empty($type['active_facets']) && !empty($query['facet'])) {
diff --git a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
index 616cb94c..e5ecdb9a 100644
--- a/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
+++ b/culturefeed_search_ui/lib/Drupal/CultureFeedSearchPage.php
@@ -570,7 +570,7 @@ protected function build() {
           $build['pager-container']['pager'] = array(
             '#type' => 'link',
             '#title' => t('More results'),
-            '#href' => $_GET['q'] . '/nojs',
+            '#href' => strpos('nojs') === FALSE ? $_GET['q'] . '/nojs' : $_GET['q'],
             '#options' => array('query' => $params),
             '#ajax' => array(),
             '#attributes' => array(