diff --git a/cache/class_index.php b/cache/class_index.php index f356313b4..90edbaa19 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/PDF.php', + 'PDF' => 'override/classes/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/Stock.php', + 'Stock' => 'override/classes/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/stock/StockMvt.php', + 'StockMvt' => 'override/classes/StockMvt.php', 'StockMvtCore' => 'classes/stock/StockMvt.php', - 'StockMvtReason' => 'override/classes/stock/StockMvtReason.php', + 'StockMvtReason' => 'override/classes/StockMvtReason.php', 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', 'StockMvtWS' => 'override/classes/stock/StockMvtWS.php', 'StockMvtWSCore' => 'classes/stock/StockMvtWS.php', diff --git a/classes/Meta.php b/classes/Meta.php index 64f29a9a1..4134e73a2 100644 --- a/classes/Meta.php +++ b/classes/Meta.php @@ -307,7 +307,7 @@ class MetaCore extends ObjectModel { if (empty($row['meta_description'])) $row['meta_description'] = strip_tags($row['meta_description']); - $row['meta_title'] .= $row['name'].(!empty($page_number) ? ' ('.$page_number.')' : ''); + $row['meta_title'] = ($row['meta_title'] ? $row['meta_title'] : $row['name']).(!empty($page_number) ? ' ('.$page_number.')' : ''); $row['meta_title'] .= ' - '.Configuration::get('PS_SHOP_NAME'); return Meta::completeMetaTags($row, $row['meta_title']); }