Use correct urls

tuursw · Sep 12, 2013 · be43c9d · be43c9d
1 parent ce3f9e5
commit be43c9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/culturefeed_agenda/includes/helpers.inc b/culturefeed_agenda/includes/helpers.inc
@@ -266,10 +266,10 @@ function culturefeed_agenda_get_production_program_data_for_item(Cultuurnet\Sear
       if ($organiser->getActor() && $organiser->getActor()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())) {
         $actor = $organiser->getActor();
         $organiser_actor_details = $organiser->getActor()->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language());
-        $data['all_url'] = culturefeed_search_detail_url('production', $actor->getCdbid(), $actor->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getTitle());
+        $data['all_url'] = culturefeed_search_detail_url('actor', $actor->getCdbid(), $actor->getDetails()->getDetailByLanguage(culturefeed_search_get_preferred_language())->getTitle());
       }
       elseif ($organiser->getLabel() && $organiser->getCdbid()) {
-        $data['all_url'] = culturefeed_search_detail_url('production', $organiser->getCdbid(), $organiser->getLabel());
+        $data['all_url'] = culturefeed_search_detail_url('actor', $organiser->getCdbid(), $organiser->getLabel());
       }
 
     }

diff --git a/culturefeed_devel/culturefeed_devel.module b/culturefeed_devel/culturefeed_devel.module
@@ -101,7 +101,7 @@ function culturefeed_devel_shutdown() {
     return;
   }
 
-  if (variable_get('culturefeed_devel_show_requests', TRUE)) {
+  if (variable_get('culturefeed_devel_show_requests', TRUE) && user_access('access culturefeed devel information')) {
     print culturefeed_devel_requests_table($requests, $max_time);
   }
 

diff --git a/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php b/culturefeed_search/lib/Drupal/DrupalCultureFeedSearchService.php
@@ -70,7 +70,6 @@ public function search($parameters = array()) {
     DrupalCultureFeedSearchService::addLanguageParameter($parameters);
 
     $items = $this->service->search($parameters);
-
     DrupalCultureFeedSearchService::translateCategories($items);
 
     return $items;
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,7 +101,7 @@ function culturefeed_devel_shutdown() { @@
         return;
       }
-      if (variable_get('culturefeed_devel_show_requests', TRUE)) {
+      if (variable_get('culturefeed_devel_show_requests', TRUE) && user_access('access culturefeed devel information')) {
         print culturefeed_devel_requests_table($requests, $max_time);
       }
@@ Expand Down @@