Also activate metadata checks for nojs versions

tuursw · Sep 19, 2013 · 4e4baaa · 4e4baaa
1 parent fb2229d
commit 4e4baaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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(