From 325e254bcd56cad95a33850db8d935168955a41a Mon Sep 17 00:00:00 2001 From: fSerny Date: Mon, 14 May 2012 09:40:26 +0000 Subject: [PATCH] [-] BO : Bug fix on module extract zip - #PSCFI-5335 --- cache/class_index.php | 8 ++++---- classes/Tools.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cache/class_index.php b/cache/class_index.php index 90edbaa19..f356313b4 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -462,7 +462,7 @@ 'OrderSlipCore' => 'classes/order/OrderSlip.php', 'OrderState' => 'override/classes/order/OrderState.php', 'OrderStateCore' => 'classes/order/OrderState.php', - 'PDF' => 'override/classes/PDF.php', + 'PDF' => 'override/classes/pdf/PDF.php', 'PDFCore' => 'classes/pdf/PDF.php', 'PDFGenerator' => 'override/classes/pdf/PDFGenerator.php', 'PDFGeneratorCore' => 'classes/pdf/PDFGenerator.php', @@ -548,7 +548,7 @@ 'StateCore' => 'classes/State.php', 'StatisticsController' => 'override/controllers/front/StatisticsController.php', 'StatisticsControllerCore' => 'controllers/front/StatisticsController.php', - 'Stock' => 'override/classes/Stock.php', + 'Stock' => 'override/classes/stock/Stock.php', 'StockAvailable' => 'override/classes/stock/StockAvailable.php', 'StockAvailableCore' => 'classes/stock/StockAvailable.php', 'StockCore' => 'classes/stock/Stock.php', @@ -559,9 +559,9 @@ 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', 'StockManagerModule' => 'override/classes/stock/StockManagerModule.php', 'StockManagerModuleCore' => 'classes/stock/StockManagerModule.php', - 'StockMvt' => 'override/classes/StockMvt.php', + 'StockMvt' => 'override/classes/stock/StockMvt.php', 'StockMvtCore' => 'classes/stock/StockMvt.php', - 'StockMvtReason' => 'override/classes/StockMvtReason.php', + 'StockMvtReason' => 'override/classes/stock/StockMvtReason.php', 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', 'StockMvtWS' => 'override/classes/stock/StockMvtWS.php', 'StockMvtWSCore' => 'classes/stock/StockMvtWS.php', diff --git a/classes/Tools.php b/classes/Tools.php index 58d39e440..1ef0385a8 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1806,7 +1806,7 @@ FileETag INode MTime Size $zip = new PclZip($fromFile); $list = $zip->extract(PCLZIP_OPT_PATH, $toDir); foreach ($list as $extractedFile) - if ($extractedFile['status'] != 'ok') + if ($extractedFile['status'] != 'ok' && $extractedFile['status'] != 'already_a_directory') return false; return true; }