Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / SL / DB / ShopPart.pm

diff --git a/SL/DB/ShopPart.pm b/SL/DB/ShopPart.pm
index 190aa2b1485fec98281168aaec7892c56262affe..7c67bb1a367fe8b43a891526d66837c4621cc89a 100644 (file)
--- a/SL/DB/ShopPart.pm
+++ b/SL/DB/ShopPart.pm
@@ -50,7 +50,7 @@ sub get_tax_and_price {
 }
 
 sub get_images {
 }
 
 sub get_images {

-  my ( $self ) = @_;
+  my ($self, %params) = @_;

 
   require SL::DB::ShopImage;
   my $images = SL::DB::Manager::ShopImage->get_all( where => [ 'files.object_id' => $self->{part_id}, ], with_objects => 'file', sort_by => 'position' );
 
   require SL::DB::ShopImage;
   my $images = SL::DB::Manager::ShopImage->get_all( where => [ 'files.object_id' => $self->{part_id}, ], with_objects => 'file', sort_by => 'position' );


@@ -61,7 +61,9 @@ sub get_images {
     # file->extension should be in SL::File, a valid extension may also be 'tar.gz'
     my ($path, $extension) = split(/\.([^\.]+)$/, $file->file_name);
     my $content            = File::Slurp::read_file($file->get_file);
     # file->extension should be in SL::File, a valid extension may also be 'tar.gz'
     my ($path, $extension) = split(/\.([^\.]+)$/, $file->file_name);
     my $content            = File::Slurp::read_file($file->get_file);

-    my $temp ={ ( link        => 'data:' . $file->mime_type . ';base64,' . MIME::Base64::encode($content, ""), #$content, # MIME::Base64::encode($content),
+
+    my $temp ={ (
+                  link        => $params{want_binary} ? $content : 'data:' . $file->mime_type . ';base64,' . MIME::Base64::encode($content, ""),

                   description => $img->file->title,
                   position    => $img->position,
                   extension   => $extension,
                   description => $img->file->title,
                   position    => $img->position,
                   extension   => $extension,