Ticket #15737: blogger-importer.patch

trunk/blogger-importer.php

@@ -226 +226 @@
 
                 $interval = STATUS_INTERVAL * 1000;
 
+                $init = '';
+                $rows = '';
+                
                 foreach ( $this->blogs as $i => $blog ) {
                         if ( $blog['mode'] == 'init' )
                                 $value = $start;
@@ -684 +687 @@
                 $tothis = __('WordPress login', 'blogger-importer');
                 $submit = esc_js( __('Save Changes', 'blogger-importer') );
 
+                $rows = '';
                 foreach ( $blog['authors'] as $i => $author )
                         $rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>";
 
@@ -694 +698 @@
                 global $importer_users;
                 if ( ! isset( $importer_users ) )
                         $importer_users = (array) get_users_of_blog();
-
+                
+                $options = '';
+                
                 foreach ( $importer_users as $user ) {
-                        $sel = ( $user->user_id == $current ) ? " selected='selected'" : '';
-                        $options .= "<option value='$user->user_id'$sel>$user->display_name</option>";
+                        $sel = ( $user->data->ID == $current ) ? " selected='selected'" : '';
+                        $options .= "<option value='".$user->data->ID."'$sel>$user->display_name</option>";
                 }
 
                 return $options;
@@ -761 +767 @@
         }
 
         function _txrx( $sock, $request ) {
+                $response = '';
                 fwrite( $sock, $request );
                 while ( ! feof( $sock ) )
                         $response .= @ fread ( $sock, 8192 );
@@ -805 +812 @@
                 $response_header_array = array();
                 foreach($response_header_lines as $header_line) {
                         list($header,$value) = explode(': ', $header_line, 2);
-                        $response_header_array[$header] .= $value."\n";
+                        if ( isset($response_header_array[$header]) )
+                                $response_header_array[$header] .= $value."\n";
+                        else
+                                $response_header_array[$header] = $value."\n";
                 }
 
                 $cookie_array = array();
-                $cookies = explode("\n", $response_header_array["Set-Cookie"]);
-                foreach($cookies as $this_cookie) { array_push($cookie_array, "Cookie: ".$this_cookie); }
-
+                if ( isset($response_header_array["Set-Cookie"]) )
+                        $cookies = explode("\n", $response_header_array["Set-Cookie"]);
+                
+                if ( isset($cookies) && is_array($cookies) ) {
+                        foreach($cookies as $this_cookie) { 
+                                array_push($cookie_array, "Cookie: ".$this_cookie); 
+                        }
+                }
                 return array("code" => $response_code, "header" => $response_header_array, "cookies" => $cookie_array, "body" => $response_body);
         }