From cf002df6f2a767f5c4c12dce6b04a9682d5325b2 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 10 May 2012 13:54:05 +0000 Subject: [PATCH] [-] FO : fix #PSCFV-548 - when ordering out of stock downloadable product, the download is not available in order history git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15174 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 0a352bddb..dab0eabd3 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1026,7 +1026,7 @@ class AdminProductsControllerCore extends AdminController if (!$this->action) parent::initProcess(); - if ($this->action == 'save' || $this->action == 'new' && isset($this->available_tabs[Tools::getValue('key_tab')])) + if (isset($this->available_tabs[Tools::getValue('key_tab')])) $this->tab_display = Tools::getValue('key_tab'); // Set tab to display if not decided already @@ -1452,7 +1452,7 @@ class AdminProductsControllerCore extends AdminController if ($this->display == 'edit') $this->redirect_after = self::$currentIndex.'&id_product='.(int)$this->object->id .(Tools::getIsset('id_category') ? '&id_category='.(int)Tools::getValue('id_category') : '') - .'&addproduct&conf=3&key_tab='.Tools::safeOutput(Tools::getValue('key_tab')).'&token='.$this->token; + .'&updateproduct&conf=3&key_tab='.Tools::safeOutput(Tools::getValue('key_tab')).'&token='.$this->token; else // Default behavior (save and back) $this->redirect_after = self::$currentIndex