<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[4871] sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php: Official WordPress Events: Improve alignment, spacing, etc (whitespace only)</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/4871">4871</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4871","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-03 21:51:02 +0000 (Fri, 03 Feb 2017)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Official WordPress Events: Improve alignment, spacing, etc (whitespace only)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsofficialwordpresseventsofficialwordpresseventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php  2017-02-03 17:47:52 UTC (rev 4870)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php    2017-02-03 21:51:02 UTC (rev 4871)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin Name: Official WordPress Events
</span><span class="cx" style="display: block; padding: 0 10px"> Description: Retrieves data on official WordPress events
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,13 +37,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Constructor
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'wp_enqueue_scripts',           array( $this, 'enqueue_scripts' ) );
-               add_shortcode( 'official_wordpress_events', array( $this, 'render_events' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_action( 'wp_enqueue_scripts',           array( $this, 'enqueue_scripts'    ) );
+               add_action( 'owpe_prime_events_cache',      array( $this, 'prime_events_cache' ) );
+               add_shortcode( 'official_wordpress_events', array( $this, 'render_events'      ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'owpe_prime_events_cache', array( $this, 'prime_events_cache' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( ! wp_next_scheduled( 'owpe_prime_events_cache' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        wp_schedule_event( time(), 'hourly', 'owpe_prime_events_cache');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 wp_schedule_event( time(), 'hourly', 'owpe_prime_events_cache' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Fetch all upcoming official events from various external APIs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * 
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  *
</ins><span class="cx" style="display: block; padding: 0 10px">          * @return array
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected function fetch_upcoming_events() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        case 1 :
</span><span class="cx" style="display: block; padding: 0 10px">                        default :
</span><span class="cx" style="display: block; padding: 0 10px">                                $request_params = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'type'   => 'wordcamp',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'type' => 'wordcamp',
</ins><span class="cx" style="display: block; padding: 0 10px">                                 );
</span><span class="cx" style="display: block; padding: 0 10px">                                $endpoint = add_query_arg( $request_params, self::WORDCAMP_API_BASE_URL . 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,8 +231,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected function get_wordcamp_events() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $endpoint  = $this->get_wordcamp_events_endpoint( self::WORDCAMP_API_VERSION );
-               $response  = $this->remote_get( esc_url_raw( $endpoint ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $endpoint = $this->get_wordcamp_events_endpoint( self::WORDCAMP_API_VERSION );
+               $response = $this->remote_get( esc_url_raw( $endpoint ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                switch ( self::WORDCAMP_API_VERSION ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        case 1 :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,9 +318,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $wordcamps ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        foreach ( $wordcamps as $wordcamp ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $event = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'source_id' => $wordcamp->id,
-                                       'type'  => 'wordcamp',
-                                       'title' => $wordcamp->title->rendered,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'source_id'   => $wordcamp->id,
+                                       'type'        => 'wordcamp',
+                                       'title'       => $wordcamp->title->rendered,
</ins><span class="cx" style="display: block; padding: 0 10px">                                         'description' => $wordcamp->content->rendered,
</span><span class="cx" style="display: block; padding: 0 10px">                                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                                case 'End Date (YYYY-mm-dd)':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        $value = absint( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 $value                  = absint( $value );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         $event['end_timestamp'] = $value;
</span><span class="cx" style="display: block; padding: 0 10px">                                                        break;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,68 +393,69 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $groups = array_chunk( $groups, 200, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach( $groups as $group_batch ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               foreach ( $groups as $group_batch ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $request_url = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                '%s2/events?group_id=%s&time=0,3m&page=%d&key=%s',
</span><span class="cx" style="display: block; padding: 0 10px">                                self::MEETUP_API_BASE_URL,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                implode( ',', $group_batch),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         implode( ',', $group_batch ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 200,
</span><span class="cx" style="display: block; padding: 0 10px">                                MEETUP_API_KEY
</span><span class="cx" style="display: block; padding: 0 10px">                        );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        while( '' !== $request_url ) {
-                       $response = $this->remote_get( $request_url );
-                       $body = json_decode( wp_remote_retrieve_body( $response ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 while ( '' !== $request_url ) {
+                               $response = $this->remote_get( $request_url );
+                               $body     = json_decode( wp_remote_retrieve_body( $response ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! empty ( $body->results ) ) {
-                               $meetups = $body->results;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( ! empty ( $body->results ) ) {
+                                       $meetups = $body->results;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                foreach ( $meetups as $meetup ) {
-                                       $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 );    // convert to seconds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 foreach ( $meetups as $meetup ) {
+                                               $start_timestamp = ( $meetup->time / 1000 ) + ( $meetup->utc_offset / 1000 );    // convert to seconds
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( isset( $meetup->venue ) ) {
-                                               $location = $this->format_meetup_venue_location( $meetup->venue );
-                                       } else {
-                                               $geocoded_location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
-                                               $location_parts    = $this->parse_reverse_geocode_address( $geocoded_location->address_components );
-                                               $location          = sprintf(
-                                                       '%s%s%s',
-                                                       $location_parts['city'],
-                                                       empty( $location_parts['state'] )        ?  '' : ', ' . $location_parts['state'],
-                                                       empty( $location_parts['country_name'] ) ?  '' : ', ' . $location_parts['country_name']
-                                               );
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( isset( $meetup->venue ) ) {
+                                                       $location = $this->format_meetup_venue_location( $meetup->venue );
+                                               } else {
+                                                       $geocoded_location = $this->reverse_geocode( $meetup->group->group_lat, $meetup->group->group_lon );
+                                                       $location_parts    = $this->parse_reverse_geocode_address( $geocoded_location->address_components );
+                                                       $location          = sprintf(
+                                                               '%s%s%s',
+                                                               $location_parts['city'],
+                                                               empty( $location_parts['state'] )        ? '' : ', ' . $location_parts['state'],
+                                                               empty( $location_parts['country_name'] ) ? '' : ', ' . $location_parts['country_name']
+                                                       );
+                                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( ! empty( $meetup->venue->country ) ) {
-                                               $country_code = $meetup->venue->country;
-                                       } elseif ( ! empty( $location_parts['country_code'] ) ) {
-                                               $country_code = $location_parts['country_code'];
-                                       } else {
-                                               $country_code = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! empty( $meetup->venue->country ) ) {
+                                                       $country_code = $meetup->venue->country;
+                                               } elseif ( ! empty( $location_parts['country_code'] ) ) {
+                                                       $country_code = $location_parts['country_code'];
+                                               } else {
+                                                       $country_code = '';
+                                               }
+
+                                               $events[] = new Official_WordPress_Event( array(
+                                                       'type'            => 'meetup',
+                                                       'source_id'       => $meetup->id,
+                                                       'title'           => $meetup->name,
+                                                       'url'             => $meetup->event_url,
+                                                       'meetup_name'     => $meetup->group->name,
+                                                       'meetup_url'      => sprintf( 'https://www.meetup.com/%s/', $meetup->group->urlname ),
+                                                       'description'     => $meetup->description,
+                                                       'num_attendees'   => $meetup->yes_rsvp_count,
+                                                       'start_timestamp' => $start_timestamp,
+                                                       'end_timestamp'   => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
+                                                       'location'        => $location,
+                                                       'country_code'    => $country_code,
+                                                       'latitude'        => empty( $meetup->venue->lat ) ? $meetup->group->group_lat : $meetup->venue->lat,
+                                                       'longitude'       => empty( $meetup->venue->lon ) ? $meetup->group->group_lon : $meetup->venue->lon,
+                                               ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $events[] = new Official_WordPress_Event( array(
-                                               'type'            => 'meetup',
-                                               'source_id'       => $meetup->id,
-                                               'title'           => $meetup->name,
-                                               'url'             => $meetup->event_url,
-                                               'meetup_name'     => $meetup->group->name,
-                                               'meetup_url'      => sprintf( 'https://www.meetup.com/%s/', $meetup->group->urlname ),
-                                               'description'     => $meetup->description,
-                                               'num_attendees'   => $meetup->yes_rsvp_count,
-                                               'start_timestamp' => $start_timestamp,
-                                               'end_timestamp'   => ( empty ( $meetup->duration ) ? $start_timestamp : $start_timestamp + ( $meetup->duration / 1000 ) ), // convert to seconds
-                                               'location'        => $location,
-                                               'country_code'    => $country_code,
-                                               'latitude'        => empty( $meetup->venue->lat ) ? $meetup->group->group_lat : $meetup->venue->lat,
-                                               'longitude'       => empty( $meetup->venue->lon ) ? $meetup->group->group_lon : $meetup->venue->lon,
-                                       ) );
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $request_url = $body->meta->next;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                       $request_url = $body->meta->next;
</del><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $events;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +504,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected function reverse_geocode( $latitude, $longitude ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $address  = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $response = $this->remote_get( sprintf( 'https://maps.googleapis.com/maps/api/geocode/json?latlng=%s,%s&sensor=false', $latitude, $longitude ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $response = $this->remote_get( sprintf(
+                       'https://maps.googleapis.com/maps/api/geocode/json?latlng=%s,%s&sensor=false',
+                       $latitude,
+                       $longitude
+               ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $body = json_decode( wp_remote_retrieve_body( $response ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,8 +538,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $address_components as $component ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'locality' == $component->types[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $address['city'] = $component->short_name;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( 'administrative_area_level_1' == $component->types[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $address['state'] = $component->short_name;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         } elseif ( 'country' == $component->types[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $address['country_code'] = strtoupper( $component->short_name );
</span><span class="cx" style="display: block; padding: 0 10px">                                $address['country_name'] = $component->long_name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,44 +588,44 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $response = $error = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $args['timeout'] = 30;
-                               $response = wp_remote_get( $url, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $args['timeout'] = 30;
+                       $response        = wp_remote_get( $url, $args );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( is_wp_error( $response ) ) {
-                                       $error_messages = implode( ', ', $response->get_error_messages() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( is_wp_error( $response ) ) {
+                               $error_messages = implode( ', ', $response->get_error_messages() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( false === strpos( $error_messages, 'Operation timed out' ) ) {
-                                               $error = sprintf(
-                                                       'Received WP_Error message: %s; Request was to %s; Arguments were: %s',
-                                                       $error_messages,
-                                                       $url,
-                                                       print_r( $args, true )
-                                               );
-                                       }
-                               } elseif ( 200 != $response['response']['code'] ) {
-                                       // trigger_error() has a message limit of 1024 bytes, so we truncate $response['body'] to make sure that $body doesn't get truncated.
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( false === strpos( $error_messages, 'Operation timed out' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $error = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                'Received HTTP code: %s and body: %s. Request was to: %s; Arguments were: %s',
-                                               $response['response']['code'],
-                                               substr( sanitize_text_field( $response['body'] ), 0, 500 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         'Received WP_Error message: %s; Request was to %s; Arguments were: %s',
+                                               $error_messages,
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $url,
</span><span class="cx" style="display: block; padding: 0 10px">                                                print_r( $args, true )
</span><span class="cx" style="display: block; padding: 0 10px">                                        );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                                       $response = new WP_Error( 'woe_invalid_http_response', 'Invalid HTTP response code', $response ); 
</del><span class="cx" style="display: block; padding: 0 10px">                                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        } elseif ( 200 != $response['response']['code'] ) {
+                               // trigger_error() has a message limit of 1024 bytes, so we truncate $response['body'] to make sure that $body doesn't get truncated.
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( $error ) {
-                                       $error = preg_replace( '/&key=[a-z0-9]+/i', '&key=[redacted]', $error );
-                                       trigger_error( sprintf( '%s error for %s: %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ), sanitize_text_field( $error ) ), E_USER_WARNING );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $error = sprintf(
+                                       'Received HTTP code: %s and body: %s. Request was to: %s; Arguments were: %s',
+                                       $response['response']['code'],
+                                       substr( sanitize_text_field( $response['body'] ), 0, 500 ),
+                                       $url,
+                                       print_r( $args, true )
+                               );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( $to = apply_filters( 'owe_error_email_addresses', array() ) ) {
-                                               wp_mail( $to, sprintf( '%s error for %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ) ), sanitize_text_field( $error ) );
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $response = new WP_Error( 'woe_invalid_http_response', 'Invalid HTTP response code', $response );
+                       }
+
+                       if ( $error ) {
+                               $error = preg_replace( '/&key=[a-z0-9]+/i', '&key=[redacted]', $error );
+                               trigger_error( sprintf( '%s error for %s: %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ), sanitize_text_field( $error ) ), E_USER_WARNING );
+
+                               if ( $to = apply_filters( 'owe_error_email_addresses', array() ) ) {
+                                       wp_mail( $to, sprintf( '%s error for %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ) ), sanitize_text_field( $error ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $this->maybe_pause( wp_remote_retrieve_headers( $response ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->maybe_pause( wp_remote_retrieve_headers( $response ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $response;
</span></span></pre>
</div>
</div>

</body>
</html>