Merge branch 'fix/mktime' into local_christophe

- exception 'ErrorException' with message 'imagecreatefromjpeg(): Filename cannot be empty' in /Library/WebServer/Documents/bebeboutik/modules/privatesales_family_menu/privatesales_family_menu.php:176
- Because jpeg lib is not installed locally (flemme de ouf)

modules/privatesales/Sale.php

@@ -370,7 +370,7 @@ class Sale {
             'pub' => $ps[0]['public'],
             'new' => $ps[0]['new'],
             'braderie' => $ps[0]['braderie'],
-            'uncombinable' => $ps[0]['uncombinable'],
+            'uncombinable' => isset($ps[0]['uncombinable']) ? $ps[0]['uncombinable'] : '',
             'forward_news' => $ps[0]['forward_news'],
             'position' => $ps[0]['position'],
             'lock_position' => $ps[0]['lock_position'],

modules/privatesales_family_menu/privatesales_family_menu.php

@@ -172,10 +172,10 @@ class Privatesales_Family_Menu extends Module {
 				}
 
 				// create new format image
-				$image_menu = imagecreatetruecolor(260, 211);
-				$image_cat = imagecreatefromjpeg($img_tmp);
-				imagecopyresampled($image_menu, $image_cat, 0, 0, 0, 0, 260, 211, 260, 211);
-				imagejpeg($image_menu, _PS_ROOT_DIR_.'/img/menu/'.$sale['id_category'].'.jpg',100);
+				// $image_menu = imagecreatetruecolor(260, 211);
+				// $image_cat = imagecreatefromjpeg($img_tmp);
+				// imagecopyresampled($image_menu, $image_cat, 0, 0, 0, 0, 260, 211, 260, 211);
+				// imagejpeg($image_menu, _PS_ROOT_DIR_.'/img/menu/'.$sale['id_category'].'.jpg',100);
 			}
 
 			$sales[$key_sale]['img'] = '/img/menu/'.$sale['id_category'].'.jpg';