From 4526b48acc6ed3d2c05d81359f4b9f77519a219c Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 15 Jan 2013 15:07:27 +0100
Subject: [PATCH 1/2] // Removed deprecated file

---
 modules/sendtoafriend/sendtoafriend-form.php | 32 --------------------
 1 file changed, 32 deletions(-)
 delete mode 100755 modules/sendtoafriend/sendtoafriend-form.php

diff --git a/modules/sendtoafriend/sendtoafriend-form.php b/modules/sendtoafriend/sendtoafriend-form.php
deleted file mode 100755
index de2287042..000000000
--- a/modules/sendtoafriend/sendtoafriend-form.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-* 2007-2013 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2013 PrestaShop SA
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-include(dirname(__FILE__).'/../../config/config.inc.php');
-require_once(dirname(__FILE__).'/sendtoafriend.php');
-
-$sendtoafriend = new sendToAFriend($dontTranslate = true);
-echo $sendtoafriend->displayPageForm();
-

From 50ab651c4fcdcb0a9df9e9deba450b9fdc4396ce Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 15 Jan 2013 15:37:02 +0100
Subject: [PATCH 2/2] [-] FO : recycled package should be disabled by default
 (because the option can be deactivated) #PSCFV-6639

---
 classes/Cart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 29df1bf63..2ef75e611 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -51,7 +51,7 @@ class CartCore extends ObjectModel
 	public $id_lang;
 
 	/** @var boolean True if the customer wants a recycled package */
-	public $recyclable = 1;
+	public $recyclable = 0;
 
 	/** @var boolean True if the customer wants a gift wrapping */
 	public $gift = 0;