Ticket #40353: 40353.5.patch

wp-includes/formatting.php

@@ -4173 +4173 @@
                         if ( is_wp_error( $value ) ) {
                                 $error = $value->get_error_message();
                         } else {
-                                if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+                                if ( wp_http_validate_url($value) && preg_match( '#http(s?)://(.+)#i', $value ) ) {
                                         $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.' );
@@ -4186 +4186 @@
                         if ( is_wp_error( $value ) ) {
                                 $error = $value->get_error_message();
                         } else {
-                                if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+                                if ( wp_http_validate_url($value) && preg_match( '#http(s?)://(.+)#i', $value ) ) {
                                         $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.' );