From 31bcaac4746533edff873ccc3118fcb34d0fc47a Mon Sep 17 00:00:00 2001 From: Lucas van Staden Date: Tue, 3 May 2016 17:21:32 +0800 Subject: [PATCH] adjust regex in duplicate check to not just look for an ending number, but a dashed -X digit - prevents urls keys ending in -XXXXX to be thought of as duplicates --- .../community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php b/app/code/community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php index db5468d..b249354 100644 --- a/app/code/community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php +++ b/app/code/community/EcomDev/UrlRewrite/Model/Mysql4/Indexer.php @@ -1571,7 +1571,7 @@ protected function _importFromCategoryRequestPath() 'IF(rewrite.duplicate_index IS NOT NULL ' . ' AND SUBSTRING_INDEX(rewrite.duplicate_key, ?, -1) = SUBSTRING_INDEX(request_path.request_path, ?, -1), ' . ' rewrite.duplicate_index, ' - . ' IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL))', + . ' IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL))', '/' )), 'updated' => new Zend_Db_Expr('1'), @@ -1593,7 +1593,7 @@ protected function _importFromCategoryRequestPath() unset($columns['request_path.updated']); $columns['duplicate_index'] = new Zend_Db_Expr( - 'IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL)' + 'IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL)' ); $columns = array( @@ -1682,7 +1682,7 @@ protected function _importFromProductRequestPath() 'IF(rewrite.duplicate_index IS NOT NULL ' . ' AND SUBSTRING_INDEX(rewrite.duplicate_key, ?, -1) = SUBSTRING_INDEX(request_path.request_path, ?, -1), ' . ' rewrite.duplicate_index, ' - . ' IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL))', + . ' IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL))', '/' )), 'target_path' => $targetPathExpr, @@ -1706,7 +1706,7 @@ protected function _importFromProductRequestPath() unset($columns['request_path.updated']); $columns['duplicate_index'] = new Zend_Db_Expr( - 'IF(request_path.request_path REGEXP \'[0-9]$\', 0, NULL)' + 'IF(request_path.request_path REGEXP \'-[0-9]$\', 0, NULL)' ); $columns = array(