Merge pull request #2722 from johngodley/fix/5.0.1

5.0.1 fixes

client/component/database/index.js

@@ -127,8 +127,6 @@ class Database extends React.Component {
 			<div className="redirection-database_error wpl-error">
 				<h3>{ __( 'Database problem' ) }</h3>
 
-				<p>{ error }</p>
-
 				<p>
 					<button className="button button-primary" onClick={ this.onSkip }>
 						{ __( 'Try again' ) }

client/component/redirect-edit/warning.js

@@ -100,9 +100,7 @@ export const getWarningFromState = ( item ) => {
 	if ( url.match( /%\w+%/ ) ) {
 		warnings.push(
 			<ExternalLink url="tools.php?page=redirection.php&sub=site">
-				{ __(
-					'Please add migrated permalinks to the Site page under the "Permalink Migration" section.'
-				) }
+				{ __( 'Please add migrated permalinks to the Site page under the "Permalink Migration" section.' ) }
 			</ExternalLink>
 		);
 	}
@@ -134,6 +132,22 @@ export const getWarningFromState = ( item ) => {
 		);
 	}
 
+	if ( flag_regex && url.indexOf( '^' ) > 0 ) {
+		warnings.push(
+			__(
+				'The caret {{code}}^{{/code}} should be at the start. For example: {{code}}%(example)s{{/code}}',
+				{
+					components: {
+						code: <code />,
+					},
+					args: {
+						example: '^' + url.replace( '^', '' ),
+					},
+				}
+			)
+		);
+	}
+
 	// Redirect everything
 	if ( url === '/(.*)' || url === '^/(.*)' ) {
 		warnings.push(
@@ -182,22 +196,24 @@ export const getWarningFromState = ( item ) => {
 		);
 	}
 
-	targets.forEach( ( target ) => {
-		const matches = target.match( /[|\\\$]/g );
+	if ( flag_regex === false ) {
+		targets.forEach( ( target ) => {
+			const matches = target.match( /[|\\\$]/g );
 
-		if ( matches !== null ) {
-			warnings.push(
-				__( 'Your target URL contains the invalid character {{code}}%(invalid)s{{/code}}', {
-					components: {
-						code: <code />,
-					},
-					args: {
-						invalid: matches,
-					},
-				} )
-			);
-		}
-	} );
+			if ( matches !== null ) {
+				warnings.push(
+					__( 'Your target URL contains the invalid character {{code}}%(invalid)s{{/code}}', {
+						components: {
+							code: <code />,
+						},
+						args: {
+							invalid: matches,
+						},
+					} )
+				);
+			}
+		} );
+	}
 
 	// People often try and use a relative absolute domain - /something.com/
 	[ url, ...targets ].forEach( ( target ) => {