Ticket #40353: 40353.3.patch

src/wp-includes/formatting.php

@@ -4159 +4159 @@
                         if ( is_wp_error( $value ) ) {
                                 $error = $value->get_error_message();
                         } else {
-                                if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+                                if ( !empty( $value ) && preg_match( '#http(s?)://(.+)#i', $value ) && filter_var( $value, FILTER_VALIDATE_URL ) !== FALSE  ) {
                                         $value = esc_url_raw( $value );
                                 } else {
                                         $error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
@@ -4172 +4172 @@
                         if ( is_wp_error( $value ) ) {
                                 $error = $value->get_error_message();
                         } else {
-                                if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+                                if ( !empty( $value ) && preg_match( '#http(s?)://(.+)#i', $value ) && filter_var( $value, FILTER_VALIDATE_URL ) !== FALSE  ) {
                                         $value = esc_url_raw( $value );
                                 } else {
                                         $error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );