//fix for 1.5.2.0

2012-10-22 12:41:28 +00:00
parent f38ef7b915
commit fc94b42d7d
20 changed files with 266 additions and 187 deletions
@@ -658,6 +658,8 @@ class ToolsCore

 	public static function safePostVars()
 	{
+		if (!is_array($_POST))
+			return array();
 		$_POST = array_map(array('Tools', 'htmlentitiesUTF8'), $_POST);
 	}

@@ -1172,8 +1172,12 @@ class OrderCore extends ObjectModel
 		{
 			$number = (int)Configuration::get('PS_DELIVERY_NUMBER');
 			if (!$number)
-				throw new PrestaShopException('Invalid delivery number');
-
+			{
+				//if delivery number is not set or wrong, we set a default one.
+				Configuration::updateValue('PS_DELIVERY_NUMBER', 1);
+				$number = 1;
+			}
+				
 			// Set delivery number on invoice
 			$order_invoice->delivery_number = $number;
 			$order_invoice->delivery_date = date('Y-m-d H:i:s');