Merge branch 'hotfix-2.3.174'

pull/731/merge
iglocska 2015-12-04 14:25:15 +01:00
commit 3b9f6fa5bb
1 changed files with 1 additions and 1 deletions

View File

@ -2249,7 +2249,7 @@ class AttributesController extends AppController {
$regex = '/';
if (!in_array($rC['condition'], array('endsWith', 'contains'))) $regex .= '^';
$regex .= $rC['from'];
if (!in_array($rC['condition'], array('endsWith', 'contains'))) $regex .= '$';
if (!in_array($rC['condition'], array('startsWith', 'contains'))) $regex .= '$';
$regex .= '/';
if ($rC['ci']) $regex .= 'i';
$attribute['Attribute']['value'] = preg_replace($regex, $rC['to'], $attribute['Attribute']['value']);