Adapt cherry pick to code in 2015.03 branch

aimeos · Aug 17, 2015 · 164be3c · 164be3c
1 parent 86a346e
commit 164be3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Default.php b/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Default.php
@@ -438,7 +438,7 @@ protected function _checkFields( array &$params )
 				$name = substr( $key, 19 );
 				$regex = $view->config( 'client/html/checkout/standard/address/validate/' . $name );
 
-				if( $regex && preg_match( '/' . $regex . '/', $value ) !== 1 )
+				if( $regex && preg_match( $regex, $value ) !== 1 )
 				{
 					$msg = $view->translate( 'client/html', 'Billing address part "%1$s" is invalid' );
 					$invalid[$key] = sprintf( $msg, $name );

diff --git a/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Default.php b/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Default.php
@@ -395,7 +395,7 @@ protected function _checkFields( array &$params )
 				$name = substr( $key, 19 );
 				$regex = $view->config( 'client/html/checkout/standard/address/validate/' . $name );
 
-				if( $regex && preg_match( '/' . $regex . '/', $value ) !== 1 )
+				if( $regex && preg_match( $regex, $value ) !== 1 )
 				{
 					$msg = $view->translate( 'client/html', 'Delivery address part "%1$s" is invalid' );
 					$invalid[$key] = sprintf( $msg, $name );