Bug 17600: Standardize our EXPORT_OK

[srvgit] / Koha / News.pm

diff --git a/Koha/News.pm b/Koha/News.pm
index 79f2a21..5bb78a6 100644 (file)
--- a/Koha/News.pm
+++ b/Koha/News.pm
@@ -19,7 +19,6 @@ package Koha::News;
 
 use Modern::Perl;
 
-use Carp;
 
 use Koha::Database;
 use Koha::Exceptions;
@@ -40,14 +39,14 @@ Koha::News - Koha News object set class
 =head3 search_for_display
 
 my $news = Koha::News->search_for_display({
-    type => 'slip',
+    location => 'slip',
     lang => 'en',
     library_id => $branchcode
 })
 
 Return Koha::News set for display to user
 
-You can limit the results by type(lang) and library by optional params
+You can limit the results by location, language and library by optional params
 
 library_id should be valid branchcode of defined library
 
@@ -62,7 +61,7 @@ type is one of this:
 - opacheader
 - opaccredits
 
-lang is language code - it is used only when type is opac or OpacNavRight
+lang is language code - it is used only when type is opac or any of OPAC locations
 
 =cut
 
@@ -70,15 +69,15 @@ sub search_for_display {
     my ( $self, $params ) = @_;
 
     my $search_params;
-    if ($params->{type} ) {
-        if ( $params->{type} eq 'slip' || $params->{type} eq 'koha') {
-            $search_params->{lang} = [ $params->{type}, '' ];
-        } elsif ( $params->{type} eq 'opac' && $params->{lang} ) {
+    if ($params->{location} ) {
+        if ( $params->{location} eq 'slip' || $params->{location} eq 'koha') {
+            $search_params->{lang} = [ $params->{location}, '' ];
+        } elsif ( $params->{location} eq 'opac' && $params->{lang} ) {
             $search_params->{lang} = [ $params->{lang}, '' ];
-        } elsif ( $params->{type} eq 'OpacNavRight' && $params->{lang} ) {
-            $search_params->{lang} = $params->{type} . '_' . $params->{lang};
+        } elsif ( $params->{lang} ) {
+            $search_params->{lang} = $params->{location} . '_' . $params->{lang};
         } else {
-            Koha::Exceptions::BadParameter->throw("The type and lang parameters combination is not valid");
+            Koha::Exceptions::BadParameter->throw("The location ($params->{location}) and lang ($params->{lang}) parameters combination is not valid");
         }
     }
 
@@ -90,7 +89,7 @@ sub search_for_display {
     return $self->SUPER::search($search_params, { order_by => 'number' });
 }
 
-=head3 type
+=head3 _type
 
 =cut