8738-blog-urls-with-capital=letters-move-check-to-php

Author: DenysTsymbal

Model/ResourceModel/Category.php

@@ -188,7 +188,7 @@ protected function _getLoadByIdentifierSelect($identifier, $storeIds)
             'cp.category_id = cps.category_id',
             []
         )->where(
-            'cp.identifier COLLATE utf8_bin = ?',
+            'cp.identifier = ?',
             $identifier
         )->where(
             'cps.store_id IN (?)',
@@ -226,7 +226,7 @@ protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel
      *
      * @param string $identifier
      * @param int|array $storeId
-     * @return int
+     * @return false|string
      */
     public function checkIdentifier($identifier, $storeIds)
     {
@@ -235,9 +235,15 @@ public function checkIdentifier($identifier, $storeIds)
         }
         $storeIds[] = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
         $select = $this->_getLoadByIdentifierSelect($identifier, $storeIds);
-        $select->reset(\Zend_Db_Select::COLUMNS)->columns('cp.category_id')->order('cps.store_id DESC')->limit(1);
+        $select->reset(\Zend_Db_Select::COLUMNS)->columns(['cp.category_id', 'cp.identifier'])->order('cps.store_id DESC')->limit(1);
+
+        $row = $this->getConnection()->fetchRow($select);
+        if (isset($row['category_id']) && isset($row['identifier'])
+            && $row['identifier'] == $identifier) {
+            return (string)$row['category_id'];
+        }
 
-        return $this->getConnection()->fetchOne($select);
+        return false;
     }
 
     /**

Model/ResourceModel/Post.php

@@ -340,7 +340,7 @@ protected function _getLoadByIdentifierSelect($identifier, $storeIds)
             'cp.post_id = cps.post_id',
             []
         )->where(
-            'cp.identifier COLLATE utf8_bin = ?',
+            'cp.identifier = ?',
             $identifier
         )->where(
             'cps.store_id IN (?)',
@@ -378,7 +378,7 @@ protected function isValidPageIdentifier(\Magento\Framework\Model\AbstractModel
      *
      * @param string $identifier
      * @param int|array $storeId
-     * @return int
+     * @return false|string
      */
     public function checkIdentifier($identifier, $storeIds)
     {
@@ -387,9 +387,15 @@ public function checkIdentifier($identifier, $storeIds)
         }
         $storeIds[] = \Magento\Store\Model\Store::DEFAULT_STORE_ID;
         $select = $this->_getLoadByIdentifierSelect($identifier, $storeIds);
-        $select->reset(\Zend_Db_Select::COLUMNS)->columns('cp.post_id')->order('cps.store_id DESC')->limit(1);
+        $select->reset(\Zend_Db_Select::COLUMNS)->columns(['cp.post_id', 'cp.identifier'])->order('cps.store_id DESC')->limit(1);
+
+        $row = $this->getConnection()->fetchRow($select);
+        if (isset($row['post_id']) && isset($row['identifier'])
+            && $row['identifier'] == $identifier) {
+            return (string)$row['post_id'];
+        }
 
-        return $this->getConnection()->fetchOne($select);
+        return false;
     }
 
     /**

Model/Tag.php

@@ -134,7 +134,12 @@ public function getOwnTitle($plural = false)
      */
     public function checkIdentifier($identifier)
     {
-        return $this->load($identifier)->getId();
+        $tag = $this->load($identifier);
+        if ($tag->getIdentifier() == $identifier) {
+            return $tag->getId();
+        }
+
+        return null;
     }
 
     /**