diff --git a/ChangeLog b/ChangeLog index 685e6d2216dffb2f55c2806549d04d3aad2b6a02..8f822d08771f0f022ce601a3aac676bc91e87135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -210,6 +210,7 @@ Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selec Fix: [ bug #2861 ] Undefined variable $res when migrating Fix: [ bug #2837 ] Product list table column header does not match column body Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order +Fix: [ bug #2814 ] JPEG photos are not displayed in Product photos page ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index c1497ce19eeb2a0954a86f8fd1d051960b60ae6d..13fc195ff06f724296f4dd90c0855d7c7deb7c6d 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3196,7 +3196,7 @@ class Product extends CommonObject if (! utf8_check($file)) $file=utf8_encode($file); // To be sure file is stored in UTF8 in memory - if (dol_is_file($dir.$file) && preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file)) + if (dol_is_file($dir.$file) && preg_match('/(\.jp(e?)g|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file)) { $nbphoto++; $photo = $file;