Changeset 29661

Timestamp:

09/02/2014 02:05:48 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices when checking for local requests in in WP_Http.

props markoheijnen.
fixes #29392.

File:

• trunk/src/wp-includes/class-http.php (modified) (3 diffs)

trunk/src/wp-includes/class-http.php

@@ -202 +202 @@
         // Determine if this request is to OUR install of WordPress.
         $homeURL = parse_url( get_bloginfo( 'url' ) );
-        if ( isset( $homeURL['host'] ) ) {
-            $r['local'] = ( $homeURL['host'] == $arrURL['host'] || 'localhost' == $arrURL['host'] );
-        } else {
-            $r['local'] = false;
-        }
+        $r['local'] = 'localhost' == $arrURL['host'] || ( isset( $homeURL['host'] ) && $homeURL['host'] == $arrURL['host'] );
         unset( $homeURL );
 
@@ -638 +634 @@
 
         // Don't block requests back to ourselves by default.
-        if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] ) {
+        if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
             /**
              * Filter whether to block local requests through the proxy.
@@ -1733 +1729 @@
             return $result;
 
-        if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] )
+        if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) )
             return false;