X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fpatronimage.pl;h=92b861206065596f60ce3060d754bcad96d5d1ee;hb=c33428d543d0a8cf7cb05b3686e413d4e31cddc4;hp=84ce9f477972562a75df516f431228f46f677aa0;hpb=fc3d45bb996026e46b4f3043a060e78bf36b0186;p=koha.git

diff --git a/members/patronimage.pl b/members/patronimage.pl
index 84ce9f4779..92b8612060 100755
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -21,7 +21,7 @@
 #
 
 use strict;
-use CGI qw(:standard escapeHTML);
+use CGI; #qw(:standard escapeHTML);
 use C4::Context;
 use C4::Members;
 
@@ -41,7 +41,7 @@ patronimage.pl - Script for retrieving and formating Koha patron images for disp
 
 =head1 DESCRIPTION
 
-This script, when called from within HTML and passed a valid patron cardnumber, will retrieve the image data associated with that cardnumber, format it in proper HTML format and pass it back to be displayed.
+This script, when called from within HTML and passed a valid patron cardnumber, will retrieve the image data associated with that cardnumber if one exists, format it in proper HTML format and pass it back to be displayed.
 
 =cut
 
@@ -64,8 +64,13 @@ if ($dberror) {
 # NOTE: Never dump the contents of $imagedata->{'patronimage'} via a warn to a log or nasty
 # things will result... you have been warned!
 
-print header (-type => $imagedata->{'mimetype'}, -Content_Length => length ($imagedata->{'imagefile'})), 
-            $imagedata->{'imagefile'};
+if ($imagedata) {
+    print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -Content_Length => length ($imagedata->{'imagefile'})), $imagedata->{'imagefile'};
+    exit;
+} else {
+    warn "No image exists for $cardnumber";
+    exit;
+}
 
 exit;