Changeset 47617 for trunk/src/wp-includes/canonical.php

Timestamp:

04/24/2020 07:26:57 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove error suppression from parse_url() calls.

Previously, the @ operator was used to prevent possible warnings emitted by parse_url() in PHP < 5.3.3 when URL parsing failed.

Now that the minimum version of PHP required by WordPress is 5.6.20, this is no longer needed.

Props netpassprodsr, Howdy_McGee.
Fixes #49980. See #24780.

File:

• trunk/src/wp-includes/canonical.php (modified) (5 diffs)

trunk/src/wp-includes/canonical.php

@@ -68 +68 @@
     }
 
-    $original = @parse_url( $requested_url );
+    $original = parse_url( $requested_url );
     if ( false === $original ) {
         return;
@@ -408 +408 @@
     if ( $redirect_url && ! empty( $redirect['query'] ) ) {
         parse_str( $redirect['query'], $_parsed_query );
-        $redirect = @parse_url( $redirect_url );
+        $redirect = parse_url( $redirect_url );
 
         if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
@@ -426 +426 @@
 
     if ( $redirect_url ) {
-        $redirect = @parse_url( $redirect_url );
+        $redirect = parse_url( $redirect_url );
     }
 
     // www.example.com vs. example.com
-    $user_home = @parse_url( home_url() );
+    $user_home = parse_url( home_url() );
     if ( ! empty( $user_home['host'] ) ) {
         $redirect['host'] = $user_home['host'];
@@ -638 +638 @@
  */
 function _remove_qs_args_if_not_in_url( $query_string, array $args_to_check, $url ) {
-    $parsed_url = @parse_url( $url );
+    $parsed_url = parse_url( $url );
     if ( ! empty( $parsed_url['query'] ) ) {
         parse_str( $parsed_url['query'], $parsed_query );
@@ -661 +661 @@
  */
 function strip_fragment_from_url( $url ) {
-    $parsed_url = @parse_url( $url );
+    $parsed_url = parse_url( $url );
     if ( ! empty( $parsed_url['host'] ) ) {
         // This mirrors code in redirect_canonical(). It does not handle every case.