Skip to content

Commit 0831882

Browse files
author
Dale Sikkema
committed
MAGETWO-35833: [GitHub] Magento\Framework\Data\Collection\Filesystem filter issue #1160
1 parent a5d01de commit 0831882

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

app/code/Magento/Backup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
The Backup module allows administrators to perform backups and rollbacks. Types of backups include system, database and media backups. This module relies on the Cron module to schedule backups.
22

3-
This module does not effect the storefront.
3+
This module does not affect the storefront.

app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<arguments>
4747
<argument name="header" xsi:type="string" translate="true">Name</argument>
4848
<argument name="index" xsi:type="string">display_name</argument>
49-
<argument name="filter" xsi:type="string">0</argument>
5049
<argument name="sortable" xsi:type="string">1</argument>
5150
<argument name="column_css_class" xsi:type="string">col-name</argument>
5251
<argument name="header_css_class" xsi:type="string">col-name</argument>

lib/internal/Magento/Framework/Data/Collection/Filesystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ public function getAllIds()
696696
*/
697697
public function filterCallbackLike($field, $filterValue, $row)
698698
{
699-
$filterValueRegex = str_replace('%', '(.*?)', preg_quote($filterValue, '/'));
699+
$filterValueRegex = str_replace('%', '(.*?)', str_replace('\'', '', preg_quote($filterValue, '/')));
700700
return (bool)preg_match("/^{$filterValueRegex}\$/i", $row[$field]);
701701
}
702702

0 commit comments

Comments
 (0)