// Fix controllers file names + add missing files in override/ + ControllerFactory class is now deprecated, use Controller instead + fix NoticationCore

controllers/CmsController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7331 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

controllers/GetFileController.php

@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class getFileControllerCore extends FrontController
+class GetFileControllerCore extends FrontController
 {
 	public function run()
 	{

controllers/OrderController.php

@@ -25,8 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-ControllerFactory::includeController('ParentOrderController');
-
 class OrderControllerCore extends ParentOrderController
 {
 	public $step;
@@ -98,11 +96,11 @@ class OrderControllerCore extends ParentOrderController
 				$this->_assignCarrier();
 				break;
 			case 3:
-				//Test that the conditions (so active) were accepted by the customer 
+				//Test that the conditions (so active) were accepted by the customer
 				$cgv = Tools::getValue('cgv');
 				if (Configuration::get('PS_CONDITIONS') AND (!Validate::isBool($cgv)))
 					Tools::redirect('index.php?controller=order&step=2');
-				
+
 				if(Tools::isSubmit('processCarrier'))
 					$this->processCarrier();
 				$this->autoStep();
@@ -135,7 +133,7 @@ class OrderControllerCore extends ParentOrderController
 
 		$invoiceAddressFields = AddressFormat::getOrderedAddressFields($addressInvoice->id_country, false, true);
 		$deliveryAddressFields = AddressFormat::getOrderedAddressFields($addressDelivery->id_country, false, true);
-		
+
 		$this->context->smarty->assign(array(
 			'inv_adr_fields' => $invoiceAddressFields,
 			'dlv_adr_fields' => $deliveryAddressFields));
@@ -144,7 +142,7 @@ class OrderControllerCore extends ParentOrderController
 	public function displayContent()
 	{
 		parent::displayContent();
-		
+
 		$this->context->smarty->assign(array(
 			'currencySign' => $this->context->currency->sign,
 			'currencyRate' => $this->context->currency->conversion_rate,
@@ -277,7 +275,7 @@ class OrderControllerCore extends ParentOrderController
 
 		// Redirect instead of displaying payment modules if any module are grefted on
 		Hook::backBeforePayment('order.php?step=3');
-		
+
 		/* We may need to display an order summary */
 		$this->context->smarty->assign($this->context->cart->getSummaryDetails());
 		$this->context->smarty->assign(array(
@@ -285,7 +283,7 @@ class OrderControllerCore extends ParentOrderController
 			'taxes_enabled' => (int)(Configuration::get('PS_TAX'))
 		));
 		$this->context->cart->checkedTOS = '1';
-		
+
 		parent::_assignPayment();
 	}
 }

controllers/OrderOpcController.php

@@ -25,8 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-ControllerFactory::includeController('ParentOrderController');
-
 class OrderOpcControllerCore extends ParentOrderController
 {
 	public $php_self = 'order-opc';

controllers/PdfOrderReturnController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7104 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */

controllers/PdfOrderSlipController.php

@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7104 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */