Fix itemtype image problem in moremember.pl

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/C4/Koha.pm b/C4/Koha.pm
index a32062a..8e5b4c7 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -43,7 +43,6 @@ BEGIN {
                &getFacets
                &displayServers
                &getnbpages
-               &getitemtypeimagesrcfromurl
                &get_infos_of
                &get_notforloan_label_of
                &getitemtypeimagedir
@@ -442,21 +441,11 @@ sub getitemtypeinfo {
     $sth->execute($itemtype);
     my $res = $sth->fetchrow_hashref;
 
-    $res->{imageurl} = getitemtypeimagesrcfromurl( $res->{imageurl} );
+    $res->{imageurl} = getitemtypeimagelocation( 'intranet', $res->{imageurl} );
 
     return $res;
 }
 
-sub getitemtypeimagesrcfromurl {
-    my ($imageurl) = @_;
-
-    if ( defined $imageurl and $imageurl !~ m/^http/ ) {
-        $imageurl = getitemtypeimagesrc() . '/' . $imageurl;
-    }
-
-    return $imageurl;
-}
-
 =head2 getitemtypeimagedir
 
 =over

diff --git a/members/moremember.pl b/members/moremember.pl
index e2e25cf..3919eb1 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -240,7 +240,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 
     my $itemtypeinfo = getitemtypeinfo($itemtype);
     $row{'itemtype_description'} = $itemtypeinfo->{description};
-    $row{'itemtype_image'}       = getitemtypelocation( 'opac', $itemtypeinfo->{imageurl} );
+    $row{'itemtype_image'}       = $itemtypeinfo->{imageurl};
 
     $row{'charge'} = sprintf( "%.2f", $charge );
 

diff --git a/t/lib/KohaTest/Koha.pm b/t/lib/KohaTest/Koha.pm
index c8a1982..c1773d9 100644 (file)
--- a/t/lib/KohaTest/Koha.pm
+++ b/t/lib/KohaTest/Koha.pm
@@ -22,9 +22,9 @@ sub methods : Test( 1 ) {
       getframeworks
       getframeworkinfo
       getitemtypeinfo
-      getitemtypeimagesrcfromurl
       getitemtypeimagedir
       getitemtypeimagesrc
+      getitemtypeimagelocation
       _getImagesFromDirectory
       _getSubdirectoryNames
       getImageSets