Diff from tags/2.1.3@5468 to tags/2.2@5480 – WordPress Trac

tags/2.2/readme.html

-                      r5468
+                      r5480
 <h1 id="logo" style="text-align: center">
     <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
     <br /> Version 2.1
+    <br /> Version 2.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 …
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
 <h2>Upgrading from any previous WordPress to 2.1:</h2>
+<h2>Upgrading from any previous WordPress to 2.2:</h2>
 <ol>
     <li>Delete your old WP files, saving ones you've modified.</li>
 …
         <dd>If you've looked everywhere and still can't find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
     <dt><a href="http://codex.wordpress.org/IRC">WordPress IRC Channel</a></dt>
         <dd>Finally, there is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.freenode.net #wordpress)</dd>
+        <dd>Finally, there is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
 </dl>
 <h1>System Recommendations</h1>
 <ul>
     <li>PHP version <strong>4.1</strong> or higher.</li>
+    <li>PHP version <strong>4.2</strong> or higher.</li>
     <li>MySQL version <strong>4.0</strong> or higher.</li>
     <li>... and a link to <a href="http://wordpress.org/">http://wordpress.org</a> on your site.</li>
 …
 <h1>Upgrading from another system</h1>
 <p>WordPress can <a href="http://codex.wordpress.org/Importing_from_other_blogging_software">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
+<p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above.</p>
 <h1>XML-RPC Interface</h1>
 <p>You can now post to your WordPress blog with tools like <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://blogbuddy.sourceforge.net">BlogBuddy</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://www.ubique.ch/wapblogger/">WapBlogger</a> (post from your Wap cellphone!), <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.zempt.com/">Zempt</a>, <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
+<h1>XML-RPC and Atom Interface</h1>
+<p>You can now post to your WordPress blog with tools like <a href="http://windowslivewriter.spaces.live.com/">Windows Live Writer</a>, <a href="http://ecto.kung-foo.tv/">Ecto</a>, <a href="http://bloggar.com/">Bloggar</a>, <a href="http://radio.userland.com">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the Blogging APIs! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support">XML-RPC support on the Codex</a>.</p>
 <h1>Post via Email</h1>

tags/2.2/wp-admin/admin-ajax.php

-                      r5468
+                      r5480
     $x->send();
     break;
+case 'add-comment' :
+    if ( !current_user_can( 'edit_post', $id ) )
+        die('-1');
+    $search = isset($_POST['s']) ? $_POST['s'] : false;
+    $start = isset($_POST['page']) ? intval($_POST['page']) * 25 : 25;
+    list($comments, $total) = _wp_get_comment_list( $search, $start, 1 );
+    if ( !$comments )
+        die('1');
+    $x = new WP_Ajax_Response();
+    foreach ( (array) $comments as $comment ) {
+        get_comment( $comment );
+        ob_start();
+            _wp_comment_list_item( $comment->comment_ID );
+            $comment_list_item = ob_get_contents();
+        ob_end_clean();
+        $x->add( array(
+            'what' => 'comment',
+            'id' => $comment->comment_ID,
+            'data' => $comment_list_item
+        ) );
+    }
+    $x->send();
+    break;
 case 'add-meta' :
     if ( !current_user_can( 'edit_post', $id ) )
 …
     $_POST['post_category'] = explode(",", $_POST['catslist']);
     if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
         unset($_POST['post_category']);
+        unset($_POST['post_category']);
     if($_POST['post_ID'] < 0) {
         $_POST['temp_ID'] = $_POST['post_ID'];

tags/2.2/wp-admin/admin-db.php

-                      r5468
+                      r5480
     clean_category_cache($cat_ID);
+    if ($update)
+        do_action('edited_category', $cat_ID);
+    else
+        do_action('created_category', $cat_ID);
     return $cat_ID;
+}
 …
     $wpdb->query("DELETE FROM $wpdb->link2cat WHERE link_id = '$link_id'");
     return $wpdb->query("DELETE FROM $wpdb->links WHERE link_id = '$link_id'");
+    do_action('deleted_link', $link_id);
+}

tags/2.2/wp-admin/admin-functions.php

-                      r5468
+                      r5480
     // Check for autosave collisions
+    $temp_id = false;
     if ( isset($_POST['temp_ID']) ) {
         $temp_id = (int) $_POST['temp_ID'];
 …
             $_POST['post_ID'] = $draft_ids[$temp_id];
             unset($_POST['temp_ID']);
-            relocate_children( $temp_id, $_POST['post_ID'] );
             update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
             return edit_post();
 …
     // Reunite any orphaned attachments with their parent
+    if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
+        $draft_ids = array();
+    if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
+        relocate_children( $draft_temp_id, $post_ID );
+    if ( $temp_id && $temp_id != $draft_temp_id )
+        relocate_children( $temp_id, $post_ID );
     // Update autosave collision detection
     if ( $temp_id ) {
-        relocate_children( $temp_id, $post_ID );
         $draft_ids[$temp_id] = $post_ID;
         update_user_option( $user_ID, 'autosave_draft_ids', $draft_ids );
 …
     add_meta( $post_ID );
+    wp_update_post( $_POST);
+    wp_update_post( $_POST );
+    // Reunite any orphaned attachments with their parent
+    if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
+        $draft_ids = array();
+    if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
+        relocate_children( $draft_temp_id, $post_ID );
     // Now that we have an ID we can fix any attachment anchor hrefs
 …
             // No selected categories, strange
             $checked_categories[] = $default;
+        }
+        }
     } else {
         $checked_categories[] = $default;
 …
 function write_nested_categories( $categories ) {
     foreach ( $categories as $category ) {
         echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( $category['cat_name'] ), "</label></li>";
+        echo '<li id="category-', $category['cat_ID'], '"><label for="in-category-', $category['cat_ID'], '" class="selectit"><input value="', $category['cat_ID'], '" type="checkbox" name="post_category[]" id="in-category-', $category['cat_ID'], '"', ($category['checked'] ? ' checked="checked"' : "" ), '/> ', wp_specialchars( apply_filters('the_category', $category['cat_name'] )), "</label></li>";
         if ( $category['children'] ) {
 …
             // No selected categories, strange
             $checked_categories[] = $default;
+        }
+        }
     } else {
         $checked_categories[] = $default;
 …
         $categories = get_categories( 'hide_empty=0' );
+    $children = _get_category_hierarchy();
     if ( $categories ) {
         ob_start();
 …
             if ( $category->category_parent == $parent) {
                 echo "\t" . _cat_row( $category, $level );
+                cat_rows( $category->cat_ID, $level +1, $categories );
+                if ( isset($children[$category->cat_ID]) )
+                    cat_rows( $category->cat_ID, $level +1, $categories );
+            }
+        }
         $output = ob_get_contents();
         ob_end_clean();
         $output = apply_filters('cat_rows', $output);
 …
         if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
             $edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll of its posts will go into the default category of '%s'\nAll of its bookmarks will go into the default category of '%s'.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' )."</a>";
+            $edit .= "<td><a href='" . wp_nonce_url( "categories.php?action=delete&amp;cat_ID=$category->cat_ID", 'delete-category_' . $category->cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' )."</a>";
         else
             $edit .= "<td style='text-align:center'>".__( "Default" );
 …
     $r .= "</td>\n\t</tr>";
     return $r;
+}
+function _wp_get_comment_list( $s = false, $start, $num ) {
+    global $wpdb;
+    $start = (int) $start;
+    $num = (int) $num;
+    if ( $s ) {
+        $s = $wpdb->escape($s);
+        $comments = $wpdb->get_results("SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE
+            (comment_author LIKE '%$s%' OR
+            comment_author_email LIKE '%$s%' OR
+            comment_author_url LIKE ('%$s%') OR
+            comment_author_IP LIKE ('%$s%') OR
+            comment_content LIKE ('%$s%') ) AND
+            comment_approved != 'spam'
+            ORDER BY comment_date DESC LIMIT $start, $num");
+    } else {
+        $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $start, $num" );
+    }
+    $total = $wpdb->get_var( "SELECT FOUND_ROWS()" );
+    return array($comments, $total);
+}
+function _wp_comment_list_item( $id, $alt = 0 ) {
+    global $authordata, $comment, $wpdb;
+    $id = (int) $id;
+    $comment =& get_comment( $id );
+    $class = '';
+    $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+    $comment_status = wp_get_comment_status($comment->comment_ID);
+    if ( 'unapproved' == $comment_status )
+        $class .= ' unapproved';
+    if ( $alt % 2 )
+        $class .= ' alternate';
+    echo "<li id='comment-$comment->comment_ID' class='$class'>";
+?>
+<p><strong><?php comment_author(); ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+<?php comment_text() ?>
+<p><?php comment_date(__('M j, g:i A'));  ?> &#8212; [
+<?php
+if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+    echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
+    echo ' | <a href="' . wp_nonce_url('ocomment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
+    if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
+        echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
+        echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
+    }
+    echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ";
+}
+$post = get_post($comment->comment_post_ID);
+$post_title = wp_specialchars( $post->post_title, 'double' );
+$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+?>
+ ] &#8212; <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a></p>
+        </li>
+<?php
+}
 …
             $state = true;
             foreach ( $markerdata as $n => $markerline ) {
                 if ( strstr( $markerline, "# BEGIN {$marker}" ))
+                if (strpos($markerline, '# BEGIN ' . $marker) !== false)
                     $state = false;
                 if ( $state ) {
 …
                         fwrite( $f, "{$markerline}" );
+                }
                 if ( strstr( $markerline, "# END {$marker}" ) ) {
+                if (strpos($markerline, '# END ' . $marker) !== false) {
                     fwrite( $f, "# BEGIN {$marker}\n" );
                     if ( is_array( $insertion ))
 …
         $state = false;
         foreach ( $markerdata as $markerline ) {
             if ( strstr( $markerline, "# END {$marker}" ))
+            if (strpos($markerline, '# END ' . $marker) !== false)
                 $state = false;
             if ( $state )
                 $result[] = $markerline;
             if ( strstr( $markerline, "# BEGIN {$marker}" ))
+            if (strpos($markerline, '# BEGIN ' . $marker) !== false)
                 $state = true;
+        }
 …
     if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
         return false;
     if ( empty( $parent) ) {
         if ( isset( $_wp_menu_nopriv[$pagenow] ) )
 …
                 return false;
             if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
             return false;
+            return false;
+        }
         return true;
 …
                     $parent_file = $_wp_real_parent_file[$parent_file];
             return $parent_file;
+        }
+        }
+    }
 …
         if ( isset( $_wp_real_parent_file[$parent_file] ) )
             $parent_file = $_wp_real_parent_file[$parent_file];
         return $parent_file;
+        return $parent_file;
+    }
 …
+    }
     return array ('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1] );
+    return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version);
+}
 …
     if ( $plugins_dir ) {
         while (($file = $plugins_dir->read() ) !== false ) {
             if ( preg_match( '|^\.+$|', $file ))
+            if ( substr($file, 0, 1) == '.' )
                 continue;
             if ( is_dir( $plugin_root.'/'.$file ) ) {
 …
                 if ( $plugins_subdir ) {
                     while (($subfile = $plugins_subdir->read() ) !== false ) {
                         if ( preg_match( '|^\.+$|', $subfile ))
+                        if ( substr($subfile, 0, 1) == '.' )
                             continue;
                         if ( preg_match( '|\.php$|', $subfile ))
+                        if ( substr($subfile, -4) == '.php' )
                             $plugin_files[] = "$file/$subfile";
+                    }
+                }
             } else {
                 if ( preg_match( '|\.php$|', $file ))
+                if ( substr($file, -4) == '.php' )
                     $plugin_files[] = $file;
+            }
 …
         ';
+}
+if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ))
+if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
     add_action( 'admin_footer', 'browse_happy' );
 …
 function get_importers() {
     global $wp_importers;
+    uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
     return $wp_importers;
+}
 …
     // Compute the URL
     $url = $uploads['url'] . "/$filename";
     $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
 …
     $size = strtolower( ini_get( 'upload_max_filesize' ) );
     $bytes = 0;
     if ( strstr( $size, 'k' ) )
+    if (strpos($size, 'k') !== false)
         $bytes = $size * 1024;
     if ( strstr( $size, 'm' ) )
+    if (strpos($size, 'm') !== false)
         $bytes = $size * 1024 * 1024;
     if ( strstr( $size, 'g' ) )
+    if (strpos($size, 'g') !== false)
         $bytes = $size * 1024 * 1024 * 1024;
 ?>
 <form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo attribute_escape($action) ?>">
 <p>
+<?php wp_nonce_field('import-upload'); ?>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?> )
 <input type="file" id="upload" name="import" size="25" />
 …
     wp_clearcookie();
     // Set cookies for new paths.
     wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
+    wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
+}
 …
+    }
+    imageantialias( $dst, true );
+    if (function_exists('imageantialias'))
+        imageantialias( $dst, true );
     imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 …
             // If no filters change the filename, we'll do a default transformation.
             if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) )
                 $thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 );
+                $thumb = preg_replace( '!(\.[^.]+)?$!', '.thumbnail' . '$1', basename( $file ), 1 );
             $thumbpath = str_replace( basename( $file ), $thumb, $file );

tags/2.2/wp-admin/admin-header.php

-                      r5468
+                      r5480
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 …
 <body>
 <div id="wphead">
 <h1><?php echo wptexturize(get_option(('blogname'))); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
+<h1><?php bloginfo('name'); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1>
 </div>
 <div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div>

tags/2.2/wp-admin/admin.php

-                      r5468
+                      r5480
     require_once('../wp-config.php');
+if ( get_option('db_version') != $wp_db_version )
+    wp_die(sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
+if ( get_option('db_version') != $wp_db_version ) {
+    wp_redirect(get_option('siteurl') . '/wp-admin/upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI'])));
+    exit;
+}
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 require_once(ABSPATH . 'wp-admin/admin-db.php');

tags/2.2/wp-admin/categories.js

r5468	r5480
3	3	document.forms.addcat.submit.onclick = function(e) {return killSubmit('theList.ajaxAdder("cat", "addcat");', e); };
4	4	theList.addComplete = function(what, where, update, transport) {
5		var name = getNodeValue(transport.responseXML, 'name');
	5	var name = getNodeValue(transport.responseXML, 'name').unescapeHTML();
6	6	var id = transport.responseXML.getElementsByTagName(what)[0].getAttribute('id');
7	7	var options = document.forms['addcat'].category_parent.options;

tags/2.2/wp-admin/categories.php

r5468	r5480
115	115	<?php if ( current_user_can('manage_categories') ) : ?>
116	116	<div class="wrap">
117		<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category. Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
	117	<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong> and links that were only assigned to the deleted category are set to <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category'))), apply_filters('the_category', get_catname(get_option('default_link_category')))) ?></p>
118	118	</div>
119	119

tags/2.2/wp-admin/custom-header.php

Property svn:eol-style set to native

-                      r5468
+                      r5480
     function js_includes() {
         wp_enqueue_script('cropper');
         wp_enqueue_script('colorpicker');
+        wp_enqueue_script('colorpicker');
+    }
 …
         if ( isset( $_POST['textcolor'] ) ) {
+            check_admin_referer('custom-header');
             if ( 'blank' == $_POST['textcolor'] ) {
                 set_theme_mod('header_textcolor', 'blank');
 …
+            }
+        }
+        if ( isset($_POST['resetheader']) )
+        if ( isset($_POST['resetheader']) ) {
+            check_admin_referer('custom-header');
             remove_theme_mods();
+        }
     ?>
 <script type="text/javascript">
 …
         pickColor('<?php echo HEADER_TEXTCOLOR; ?>');
+    }
     function hide_text() {
         $('name').style.display = 'none';
 …
         Event.observe( $('hidetext'), 'click', show_text );
+    }
     function show_text() {
         $('name').style.display = 'block';
 …
         $('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>';
         $('hidetext').value = '<?php _e('Hide Text'); ?>';
         Event.stopObserving( $('hidetext'), 'click', show_text );
+        Event.stopObserving( $('hidetext'), 'click', show_text );
         Event.observe( $('hidetext'), 'click', hide_text );
+    }
 …
 <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p>
 <div id="headimg" style="background: url(<?php header_image() ?>) no-repeat;">
+<div id="headimg" style="background: url(<?php clean_url(header_image()) ?>) no-repeat;">
 <h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
 <div id="desc"><?php bloginfo('description');?></div>
 …
 <input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
 <input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
+<input type="hidden" name="textcolor" id="textcolor" value="#<?php header_textcolor() ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?> &raquo;" /></form>
+<?php wp_nonce_field('custom-header') ?>
+<input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?> &raquo;" /></form>
 <?php } ?>
 …
 <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
 <input type="hidden" name="action" value="save" />
+<?php wp_nonce_field('custom-header') ?>
 <p class="submit">
 <input type="submit" value="<?php _e('Upload'); ?> &raquo;" />
 …
 <p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
 <form method="post" action="<?php echo attribute_escape(add_query_arg('step', 1)) ?>">
+<?php wp_nonce_field('custom-header'); ?>
 <input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" />
 </form>
 …
     function step_2() {
+        check_admin_referer('custom-header');
         $overrides = array('test_form' => false);
         $file = wp_handle_upload($_FILES['import'], $overrides);
 …
         if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
             set_theme_mod('header_image', $url);
+            set_theme_mod('header_image', clean_url($url));
             $header = apply_filters('wp_create_file_in_uploads', $file, $id); // For replication
             return $this->finished();
 …
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $id; ?>" />
 <input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" />
+<?php wp_nonce_field('custom-header') ?>
 <input type="submit" value="<?php _e('Crop Header &raquo;'); ?>" />
 </p>
 …
     function step_3() {
+        check_admin_referer('custom-header');
         if ( $_POST['oitar'] > 1 ) {
             $_POST['x1'] = $_POST['x1'] * $_POST['oitar'];

tags/2.2/wp-admin/edit-category-form.php

r5468	r5480
36	36	<th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
37	37	<td>
38		<?php wp_dropdown_categories('hide_empty=0&name=category_parent&selected=' . $category->category_parent . '&hierarchical=1&show_option_none=' . __('None')); ?>
	38	<?php wp_dropdown_categories('hide_empty=0&name=category_parent&orderby=name&selected=' . $category->category_parent . '&hierarchical=1&show_option_none=' . __('None')); ?>
39	39	</td>
40	40	</tr>

tags/2.2/wp-admin/edit-comments.js

-                      r5468
+                      r5480
     if ( !theCommentList )
         return false;
+    theExtraCommentList = new listMan('the-extra-comment-list');
+    if ( theExtraCommentList ) {
+        theExtraCommentList.showLink = 0;
+        theExtraCommentList.altOffset = 1;
+        if ( theExtraCommentList.theList && theExtraCommentList.theList.childNodes )
+            var commentNum = $A(theExtraCommentList.theList.childNodes).findAll( function(i) { return Element.visible(i) } ).length;
+        else
+            var commentNum = 0;
+        var urlQ   = document.location.href.split('?');
+        var params = urlQ[1] ? urlQ[1].toQueryParams() : [];
+        var search = params['s'] ? params['s'] : '';
+        var page   = params['apage'] ? params['apage'] : 1;
+    }
     theCommentList.dimComplete = function(what,id,dimClass) {
         var m = document.getElementById('awaitmod');
+        if ( document.getElementById(what + '-' + id).className.match(dimClass) ) m.innerHTML = parseInt(m.innerHTML,10) + 1;
+        else m.innerHTML = parseInt(m.innerHTML,10) - 1;
+        if ( document.getElementById(what + '-' + id).className.match(dimClass) )
+            m.innerHTML = parseInt(m.innerHTML,10) + 1;
+        else
+            m.innerHTML = parseInt(m.innerHTML,10) - 1;
+    }
     theCommentList.delComplete = function(what,id) {
         var m = document.getElementById('awaitmod');
+        if ( document.getElementById(what + '-' + id).className.match('unapproved') ) m.innerHTML = parseInt(m.innerHTML,10) - 1;
+        what = what.split('-')[0];
+        if ( document.getElementById(what + '-' + id).className.match('unapproved') )
+            m.innerHTML = parseInt(m.innerHTML,10) - 1;
+        if ( theExtraCommentList && commentNum ) {
+            var theMover = theExtraCommentList.theList.childNodes[0];
+            Element.removeClassName(theMover,'alternate');
+            theCommentList.theList.appendChild(theMover);
+            theExtraCommentList.inputData += '&page=' + page;
+            if ( search )
+                theExtraCommentList.inputData += '&s=' + search; // trust the URL not the search box
+            theExtraCommentList.addComplete = function() {
+                if ( theExtraCommentList.theList.childNodes )
+                    var commentNum = $A(theExtraCommentList.theList.childNodes).findAll( function(i) { return Element.visible(i) } ).length;
+                else
+                    var commentNum = 0;
+            }
+            theExtraCommentList.ajaxAdder( 'comment', 'ajax-response' ); // Dummy Request
+        }
+    }
     if ( theList ) // the post list: edit.php
         theList.delComplete = function() {

tags/2.2/wp-admin/edit-comments.php

-                      r5468
+                      r5480
 endif;
+if (isset($_GET['s'])) {
+    $s = $wpdb->escape($_GET['s']);
+    $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments  WHERE
+        (comment_author LIKE '%$s%' OR
+        comment_author_email LIKE '%$s%' OR
+        comment_author_url LIKE ('%$s%') OR
+        comment_author_IP LIKE ('%$s%') OR
+        comment_content LIKE ('%$s%') ) AND
+        comment_approved != 'spam'
+        ORDER BY comment_date DESC");
+} else {
+    if ( isset( $_GET['apage'] ) )
+        $page = (int) $_GET['apage'];
+    else
+        $page = 1;
+    $start = $offset = ( $page - 1 ) * 20;
+    $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1' ORDER BY comment_date DESC LIMIT $start, 20" );
+    $total = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0' OR comment_approved = '1'" );
+}
+?>
+<?php if ( $total > 20 ) {
+$total_pages = ceil( $total / 20 );
+$r = '';
+if ( 1 < $page ) {
+    $args['apage'] = ( 1 == $page - 1 ) ? FALSE : $page - 1;
+    $r .=  '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">&laquo; '. __('Previous Page') .'</a>' . "\n";
+}
+if ( ( $total_pages = ceil( $total / 20 ) ) > 1 ) {
+    for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
+        if ( $page == $page_num ) :
+            $r .=  "<span>$page_num</span>\n";
+        else :
+            $p = false;
+            if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
+                $args['apage'] = ( 1 == $page_num ) ? FALSE : $page_num;
+                $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
+                $in = true;
+            elseif ( $in == true ) :
+                $r .= "...\n";
+                $in = false;
+            endif;
+        endif;
+    endfor;
+}
+if ( ( $page ) * 20 < $total || -1 == $total ) {
+    $args['apage'] = $page + 1;
+    $r .=  '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page') .' &raquo;</a>' . "\n";
+}
+echo "<p class='pagenav'>$r</p>";
+?>
+<?php } ?>
+<?php
+if ( isset( $_GET['apage'] ) )
+    $page = (int) $_GET['apage'];
+else
+    $page = 1;
+$start = $offset = ( $page - 1 ) * 20;
+list($_comments, $total) = _wp_get_comment_list( isset($_GET['s']) ? $_GET['s'] : false, $start, 25 ); // Grab a few extra
+$comments = array_slice($_comments, 0, 20);
+$extra_comments = array_slice($_comments, 20);
+$page_links = paginate_links( array(
+    'base' => 'edit-comments.php?%_%',
+    'format' => 'apage=%#%',
+    'total' => ceil($total / 20),
+    'current' => $page
+));
+if ( $page_links )
+    echo "<p class='pagenav'>$page_links</p>";
 if ('view' == $mode) {
     if ($comments) {
+?>
+<?php
+$offset = $offset + 1;
+$start = " start='$offset'";
+        echo "<ol id='the-comment-list' class='commentlist' $start>";
+        $offset = $offset + 1;
+        $start = " start='$offset'";
+        echo "<ol id='the-comment-list' class='commentlist' $start>\n";
         $i = 0;
+        foreach ($comments as $comment) {
+        ++$i; $class = '';
+        $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
+            $comment_status = wp_get_comment_status($comment->comment_ID);
+            if ('unapproved' == $comment_status)
+                $class .= ' unapproved';
+            if ($i % 2)
+                $class .= ' alternate';
+            echo "<li id='comment-$comment->comment_ID' class='$class'>";
+?>
+<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+<?php comment_text() ?>
+<p><?php comment_date('M j, g:i A');  ?> &#8212; [
+<?php
+if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+    echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
+    echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
+    if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
+        echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
+        echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&amp;p=' . $comment->comment_post_ID . '&amp;c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
+    }
+    echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&amp;dt=spam&amp;p=" . $comment->comment_post_ID . "&amp;c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author))  . "', theCommentList );\">" . __('Spam') . "</a> ";
+}
+$post = get_post($comment->comment_post_ID);
+$post_title = wp_specialchars( $post->post_title, 'double' );
+$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
+?>
+ | <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ]</p>
+        </li>
+<?php } // end foreach($comment) ?>
+</ol>
+        foreach ( $comments as $comment ) {
+            get_comment( $comment ); // Cache it
+            _wp_comment_list_item( $comment->comment_ID, ++$i );
+        }
+        echo "</ol>\n\n";
+if ( $extra_comments ) : ?>
+<div id="extra-comments" style="display:none">
+<ul id="the-extra-comment-list" class="commentlist">
+<?php
+    foreach ( $extra_comments as $comment ) {
+        get_comment( $comment ); // Cache it
+        _wp_comment_list_item( $comment->comment_ID, ++$i );
+    }
+?>
+</ul>
+</div>
+<?php endif; // $extra_comments ?>
 <div id="ajax-response"></div>
 …
     } // end if ($comments)
+}
+    ?>
+<?php if ( $total > 20 ) {
+$total_pages = ceil( $total / 20 );
+$r = '';
+if ( 1 < $page ) {
+    $args['apage'] = ( 1 == $page - 1 ) ? FALSE : $page - 1;
+    $r .=  '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">&laquo; '. __('Previous Page') .'</a>' . "\n";
+}
+if ( ( $total_pages = ceil( $total / 20 ) ) > 1 ) {
+    for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
+        if ( $page == $page_num ) :
+            $r .=  "<span>$page_num</span>\n";
+        else :
+            $p = false;
+            if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
+                $args['apage'] = ( 1 == $page_num ) ? FALSE : $page_num;
+                $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
+                $in = true;
+            elseif ( $in == true ) :
+                $r .= "...\n";
+                $in = false;
+            endif;
+        endif;
+    endfor;
+}
+if ( ( $page ) * 20 < $total || -1 == $total ) {
+    $args['apage'] = $page + 1;
+    $r .=  '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page') .' &raquo;</a>' . "\n";
+}
+echo "<p class='pagenav'>$r</p>";
+?>
+<?php } ?>
+if ( $page_links )
+    echo "<p class='pagenav'>$page_links</p>";
+?>
 </div>

tags/2.2/wp-admin/edit-form-advanced.php

-                      r5468
+                      r5480
 <?php if ( current_user_can('edit_posts') ) : ?>
 <fieldset id="posttimestampdiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Timestamp'); ?>:</h3>
+<h3 class="dbx-handle"><?php _e('Post Timestamp'); ?></h3>
 <div class="dbx-content"><?php touch_time(($action == 'edit')); ?></div>
 </fieldset>
 …
 ?>
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Post Author'); ?>:</h3>
+<h3 class="dbx-handle"><?php _e('Post Author'); ?></h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
 …
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
+<legend><?php _e('Post') ?></legend>
+<legend><?php _e('Post') ?>
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" class="view-link" target="_blank"><?php _e('View &raquo;'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" class="view-link" target="_blank"><?php _e('Preview &raquo;'); ?></a>
+<?php } ?>
+</legend>
     <?php the_editor($post->post_content); ?>
 …
 <?php if ('edit' == $action) : $delete_nonce = wp_create_nonce( 'delete-post_' . $post_ID ); ?>
 <input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this post') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
+<input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php echo ( 'draft' == $post->post_status ) ? __('Delete this draft') : __('Delete this post'); ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
 <?php endif; ?>

tags/2.2/wp-admin/edit-form-comment.php

r5468	r5480
33	33	<legend><label for="newcomment_author_url"><?php _e('URL:') ?></label></legend>
34	34	<div>
35		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" ~~id="URL"~~ />
	35	<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" />
36	36	</div>
37	37	</fieldset>

tags/2.2/wp-admin/edit-link-form.php

-                      r5468
+                      r5480
     if ('' == $value) {
         if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"';
         if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"';
         if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"';
+        if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
+        if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
+        if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
         if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+    }

tags/2.2/wp-admin/edit-page-form.php

-                      r5468
+                      r5480
 <?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?>
 <fieldset id="authordiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Page Author'); ?>:</h3>
+<h3 class="dbx-handle"><?php _e('Page Author'); ?></h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
 …
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
+    <legend><?php _e('Page Content') ?></legend>
+<legend><?php _e('Page Content') ?>
+<?php if ( 'publish' == $post->post_status ) { ?>
+<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" style="position: absolute; right: 2em; margin-right: 19em; text-decoration: underline;" target="_blank"><?php _e('View &raquo;'); ?></a>
+<?php } elseif ( 'edit' == $action ) { ?>
+<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" style="position: absolute; right: 2em; margin-right: 19em; text-decoration: underline;" target="_blank"><?php _e('Preview &raquo;'); ?></a>
+<?php } ?>
+</legend>
     <?php the_editor($post->post_content); ?>
 </fieldset>

tags/2.2/wp-admin/edit.php

-                      r5468
+                      r5480
         if (0 != $i)
             echo ', ';
         $draft->post_title = stripslashes($draft->post_title);
+        $draft->post_title = apply_filters('the_title', stripslashes($draft->post_title));
         if ($draft->post_title == '')
             $draft->post_title = sprintf(__('Post #%s'), $draft->ID);
 …
+        }
     ?>
     .</p>
+.</p>
 <?php } ?>
 …
         if (0 != $i)
             echo ', ';
         $draft->post_title = stripslashes($draft->post_title);
+        $draft->post_title = apply_filters('the_title', stripslashes($draft->post_title));
         if ($draft->post_title == '')
             $draft->post_title = sprintf(__('Post #%s'), $draft->ID);
 …
 } else {
     if ( is_single() )
         printf(__('Comments on %s'), $post->post_title);
+        printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
     elseif ( ! is_paged() || get_query_var('paged') == 1 )
         _e('Last 15 Posts');
 …
     case 'date':
         ?>
         <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else the_time(_('Y-m-d \<\b\r \/\> g:i:s a')); ?></td>
+        <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else the_time(__('Y-m-d \<\b\r \/\> g:i:s a')); ?></td>
         <?php
         break;

tags/2.2/wp-admin/export.php

-                      r5468
+                      r5480
     echo '<wp:category_description>' . wxr_cdata($c->category_description) . '</wp:category_description>';
+}
+?>
+<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
+<!-- It contains information about your blog's posts, comments, and categories. -->
+<!-- You may use this file to transfer that content from one site to another. -->
+<!-- This file is not intended to serve as a complete backup of your blog. -->
+<!-- To import this information into a WordPress blog follow these steps. -->
+<!-- 1. Log into that blog as an administrator. -->
+<!-- 2. Go to Manage: Import in the blog's admin panels. -->
+<!-- 3. Choose "WordPress" from the list. -->
+<!-- 4. Upload this file using the form provided on that page. -->
+<!-- 5. You will first be asked to map the authors in this export file to users -->
+<!--    on the blog.  For each author, you may choose to map to an -->
+<!--    existing user on the blog or to create a new user -->
+<!-- 6. WordPress will then import each of the posts, comments, and categories -->
+<!--    contained in this file into your blog -->
+print '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
+?>
+<!--
+    This is a WordPress eXtended RSS file generated by WordPress as an export of
+    your blog. It contains information about your blog's posts, comments, and
+    categories. You may use this file to transfer that content from one site to
+    another. This file is not intended to serve as a complete backup of your
+    blog.
+    To import this information into a WordPress blog follow these steps:
+.  Log into that blog as an administrator.
+.  Go to Manage > Import in the blog's admin.
+.  Choose "WordPress" from the list of importers.
+.  Upload this file using the form provided on that page.
+.  You will first be asked to map the authors in this export file to users
+        on the blog. For each author, you may choose to map an existing user on
+        the blog or to create a new user.
+.  WordPress will then import each of the posts, comments, and categories
+        contained in this file onto your blog.
+-->
 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->
 …
 <wp:status><?php echo $post->post_status; ?></wp:status>
 <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>
+<wp:menu_order><?php echo $post->menu_order; ?></wp:menu_order>
 <wp:post_type><?php echo $post->post_type; ?></wp:post_type>
 <?php

tags/2.2/wp-admin/import.php

-                      r5468
+                      r5480
 if ($imports_dir) {
     while (($file = $imports_dir->read()) !== false) {
         if (preg_match('|^\.+$|', $file))
+        if ($file{0} == '.') {
             continue;
+        if (preg_match('|\.php$|', $file))
+            require_once("$import_root/$file");
+        } elseif (substr($file, -4) == '.php') {
+            require_once($import_root . '/' . $file);
+        }
+    }
+}

tags/2.2/wp-admin/import/blogger.php

-                      r5468
+                      r5480
 <?php
+define( 'MAX_RESULTS',        50 ); // How many records per GData query
+define( 'MAX_EXECUTION_TIME', 20 ); // How many seconds to let the script run
+define( 'STATUS_INTERVAL',     3 ); // How many seconds between status bar updates
 class Blogger_Import {
+    var $lump_authors = false;
+    var $import = array();
+    // Shows the welcome screen and the magic iframe.
+    // Shows the welcome screen and the magic auth link.
     function greet() {
+        $title = __('Import Old Blogger');
+        $welcome = __('Howdy! This importer allows you to import posts and comments from your Old Blogger account into your WordPress blog.');
+        $noiframes = __('This feature requires iframe support.');
+        $warning = js_escape(__('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?'));
+        $reset = __('Reset this importer');
+        $incompat = __('Your web server is not properly configured to use this importer. Please enable the CURL extension for PHP and then reload this page.');
+        echo "<div class='wrap'><h2>$title</h2><p>$welcome</p>";
+        echo "<p>" . __('Please note that this importer <em>does not work with new Blogger (using your Google account)</em>.') . "</p>";
+        if ( function_exists('curl_init') )
+            echo "<iframe src='admin.php?import=blogger&amp;noheader=true' height='350px' width = '99%'>$noiframes</iframe><p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
+        $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&noheader=true';
+        $auth_url = "https://www.google.com/accounts/AuthSubRequest";
+        $title = __('Import Blogger');
+        $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
+        $prereqs = __('To use this importer, you must have a Google account, an upgraded (New, was Beta) blog, and it must be on blogspot or a custom domain (not FTP).');
+        $stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
+        $auth = __('Authorize');
+        echo "
+        <div class='wrap'><h2>$title</h2><p>$welcome</p><p>$prereqs</p><p>$stepone</p>
+            <form action='$auth_url' method='get'>
+                <p class='submit' style='text-align:left;'>
+                    <input type='submit' value='$auth' />
+                    <input type='hidden' name='scope' value='http://www.blogger.com/feeds/' />
+                    <input type='hidden' name='session' value='1' />
+                    <input type='hidden' name='secure' value='0' />
+                    <input type='hidden' name='next' value='$next_url' />
+                </p>
+            </form>
+        </div>\n";
+    }
+    function uh_oh($title, $message, $info) {
+        echo "<div class='wrap'><h2>$title</h2><p>$message</p><pre>$info</pre></div>";
+    }
+    function auth() {
+        // We have a single-use token that must be upgraded to a session token.
+        $token = preg_replace( '/[^-_0-9a-zA-Z]/', '', $_GET['token'] );
+        $headers = array(
+            "GET /accounts/AuthSubSessionToken HTTP/1.0",
+            "Authorization: AuthSub token=\"$token\""
+        );
+        $request = join( "\r\n", $headers ) . "\r\n\r\n";
+        $sock = $this->_get_auth_sock( );
+        if ( ! $sock ) return false;
+        $response = $this->_txrx( $sock, $request );
+        preg_match( '/token=([-_0-9a-z]+)/i', $response, $matches );
+        if ( empty( $matches[1] ) ) {
+            $this->uh_oh(
+                __( 'Authorization failed' ),
+                __( 'Something went wrong. If the problem persists, send this info to support:' ),
+                htmlspecialchars($response)
+            );
+            return false;
+        }
+        $this->token = $matches[1];
+        wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) );
+    }
+    function get_token_info() {
+        $headers = array(
+            "GET /accounts/AuthSubTokenInfo  HTTP/1.0",
+            "Authorization: AuthSub token=\"$this->token\""
+        );
+        $request = join( "\r\n", $headers ) . "\r\n\r\n";
+        $sock = $this->_get_auth_sock( );
+        if ( ! $sock ) return;
+        $response = $this->_txrx( $sock, $request );
+        return $this->parse_response($response);
+    }
+    function token_is_valid() {
+        $info = $this->get_token_info();
+        if ( $info['code'] == 200 )
+            return true;
+        return false;
+    }
+    function show_blogs($iter = 0) {
+        if ( empty($this->blogs) ) {
+            $headers = array(
+                "GET /feeds/default/blogs HTTP/1.0",
+                "Host: www2.blogger.com",
+                "Authorization: AuthSub token=\"$this->token\""
+            );
+            $request = join( "\r\n", $headers ) . "\r\n\r\n";
+            $sock = $this->_get_blogger_sock( );
+            if ( ! $sock ) return;
+            $response = $this->_txrx( $sock, $request );
+            // Quick and dirty XML mining.
+            list( $headers, $xml ) = explode( "\r\n\r\n", $response );
+            $p = xml_parser_create();
+            xml_parse_into_struct($p, $xml, $vals, $index);
+            xml_parser_free($p);
+            $this->title = $vals[$index['TITLE'][0]]['value'];
+            // Give it a few retries... this step often flakes out the first time.
+            if ( empty( $index['ENTRY'] ) ) {
+                if ( $iter < 3 ) {
+                    return $this->show_blogs($iter + 1);
+                } else {
+                    $this->uh_oh(
+                        __('Trouble signing in'),
+                        __('We were not able to gain access to your account. Try starting over.'),
+                        ''
+                    );
+                    return false;
+                }
+            }
+            foreach ( $index['ENTRY'] as $i ) {
+                $blog = array();
+                while ( ( $tag = $vals[$i] ) && ! ( $tag['tag'] == 'ENTRY' && $tag['type'] == 'close' ) ) {
+                    if ( $tag['tag'] == 'TITLE' ) {
+                        $blog['title'] = $tag['value'];
+                    } elseif ( $tag['tag'] == 'SUMMARY' ) {
+                        $blog['summary'] == $tag['value'];
+                    } elseif ( $tag['tag'] == 'LINK' ) {
+                        if ( $tag['attributes']['REL'] == 'alternate' && $tag['attributes']['TYPE'] == 'text/html' ) {
+                            $parts = parse_url( $tag['attributes']['HREF'] );
+                            $blog['host'] = $parts['host'];
+                        } elseif ( $tag['attributes']['REL'] == 'edit' )
+                            $blog['gateway'] = $tag['attributes']['HREF'];
+                    }
+                    ++$i;
+                }
+                if ( ! empty ( $blog ) ) {
+                    $blog['total_posts'] = $this->get_total_results('posts', $blog['host']);
+                    $blog['total_comments'] = $this->get_total_results('comments', $blog['host']);
+                    $blog['mode'] = 'init';
+                    $this->blogs[] = $blog;
+                }
+            }
+            if ( empty( $this->blogs ) ) {
+                $this->uh_oh(
+                    __('No blogs found'),
+                    __('We were able to log in but there were no blogs. Try a different account next time.'),
+                    ''
+                );
+                return false;
+            }
+        }
+//echo '<pre>'.print_r($this,1).'</pre>';
+        $start    = js_escape( __('Import') );
+        $continue = js_escape( __('Continue') );
+        $stop     = js_escape( __('Importing...') );
+        $authors  = js_escape( __('Set Authors') );
+        $loadauth = js_escape( __('Preparing author mapping form...') );
+        $authhead = js_escape( __('Final Step: Author Mapping') );
+        $nothing  = js_escape( __('Nothing was imported. Had you already imported this blog?') );
+        $title    = __('Blogger Blogs');
+        $name     = __('Blog Name');
+        $url      = __('Blog URL');
+        $action   = __('The Magic Button');
+        $posts    = __('Posts');
+        $comments = __('Comments');
+        $noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don\'t worry, you can turn it back off when you\'re done.');
+        $interval = STATUS_INTERVAL * 1000;
+        foreach ( $this->blogs as $i => $blog ) {
+            if ( $blog['mode'] == 'init' )
+                $value = $start;
+            elseif ( $blog['mode'] == 'posts' || $blog['mode'] == 'comments' )
+                $value = $continue;
+            else
+                $value = $authors;
+            $blogtitle = js_escape( $blog['title'] );
+            $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0;
+            $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0;
+            $init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');';
+            $pstat = "<div class='ind' id='pind$i'>&nbsp;</div><div id='pstat$i' class='stat'>$pdone/{$blog['total_posts']}</div>";
+            $cstat = "<div class='ind' id='cind$i'>&nbsp;</div><div id='cstat$i' class='stat'>$cdone/{$blog['total_comments']}</div>";
+            $rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n";
+        }
+        echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></thead>\n$rows</table></form></div>";
+        echo "
+        <script type='text/javascript'>
+            var strings = {cont:'$continue',stop:'$stop',stopping:'$stopping',authors:'$authors',nothing:'$nothing'};
+            var blogs = {};
+            function blog(i, title, mode, status){
+                this.blog   = i;
+                this.mode   = mode;
+                this.title  = title;
+                this.status = status;
+                this.button = document.getElementById('submit'+this.blog);
+            };
+            blog.prototype = {
+                start: function() {
+                    this.cont = true;
+                    this.kick();
+                    this.check();
+                },
+                kick: function() {
+                    ++this.kicks;
+                    var i = this.blog;
+                    jQuery.post('admin.php?import=blogger&noheader=true',{blog:this.blog},function(text,result){blogs[i].kickd(text,result)});
+                },
+                check: function() {
+                    ++this.checks;
+                    var i = this.blog;
+                    jQuery.post('admin.php?import=blogger&noheader=true&status=true',{blog:this.blog},function(text,result){blogs[i].checkd(text,result)});
+                },
+                kickd: function(text, result) {
+                    if ( result == 'error' ) {
+                        // TODO: exception handling
+                        if ( this.cont )
+                            setTimeout('blogs['+this.blog+'].kick()', 1000);
+                    } else {
+                        if ( text == 'done' ) {
+                            this.stop();
+                            this.done();
+                        } else if ( text == 'nothing' ) {
+                            this.stop();
+                            this.nothing();
+                        } else if ( text == 'continue' ) {
+                            this.kick();
+                        } else if ( this.mode = 'stopped' )
+                            jQuery(this.button).attr('value', strings.cont);
+                    }
+                    --this.kicks;
+                },
+                checkd: function(text, result) {
+                    if ( result == 'error' ) {
+                        // TODO: exception handling
+                    } else {
+                        eval('this.status='+text);
+                        jQuery('#pstat'+this.blog).empty().append(this.status.p1+'/'+this.status.p2);
+                        jQuery('#cstat'+this.blog).empty().append(this.status.c1+'/'+this.status.c2);
+                        this.update();
+                        if ( this.cont || this.kicks > 0 )
+                            setTimeout('blogs['+this.blog+'].check()', $interval);
+                    }
+                    --this.checks;
+                },
+                update: function() {
+                    jQuery('#pind'+this.blog).width(((this.status.p1>0&&this.status.p2>0)?(this.status.p1/this.status.p2*jQuery('#pind'+this.blog).parent().width()):1)+'px');
+                    jQuery('#cind'+this.blog).width(((this.status.c1>0&&this.status.c2>0)?(this.status.c1/this.status.c2*jQuery('#cind'+this.blog).parent().width()):1)+'px');
+                },
+                stop: function() {
+                    this.cont = false;
+                },
+                done: function() {
+                    this.mode = 'authors';
+                    jQuery(this.button).attr('value', strings.authors);
+                },
+                nothing: function() {
+                    this.mode = 'nothing';
+                    jQuery(this.button).remove();
+                    alert(strings.nothing);
+                },
+                getauthors: function() {
+                    if ( jQuery('div.wrap').length > 1 )
+                        jQuery('div.wrap').gt(0).remove();
+                    jQuery('div.wrap').empty().append('<h2>$authhead</h2><h3>' + this.title + '</h3>');
+                    jQuery('div.wrap').append('<p id=\"auth\">$loadauth</p>');
+                    jQuery('p#auth').load('index.php?import=blogger&noheader=true&authors=1',{blog:this.blog});
+                },
+                init: function() {
+                    this.update();
+                    var i = this.blog;
+                    jQuery(this.button).bind('click', function(){return blogs[i].click();});
+                    this.kicks = 0;
+                    this.checks = 0;
+                },
+                click: function() {
+                    if ( this.mode == 'init' || this.mode == 'stopped' || this.mode == 'posts' || this.mode == 'comments' ) {
+                        this.mode = 'started';
+                        this.start();
+                        jQuery(this.button).attr('value', strings.stop);
+                    } else if ( this.mode == 'started' ) {
+                        return false; // let it run...
+                        this.mode = 'stopped';
+                        this.stop();
+                        if ( this.checks > 0 || this.kicks > 0 ) {
+                            this.mode = 'stopping';
+                            jQuery(this.button).attr('value', strings.stopping);
+                        } else {
+                            jQuery(this.button).attr('value', strings.cont);
+                        }
+                    } else if ( this.mode == 'authors' ) {
+                        document.location = 'index.php?import=blogger&authors=1&blog='+this.blog;
+                        //this.mode = 'authors2';
+                        //this.getauthors();
+                    }
+                    return false;
+                }
+            };
+            $init
+            jQuery.each(blogs, function(i, me){me.init();});
+        </script>\n";
+    }
+    // Handy function for stopping the script after a number of seconds.
+    function have_time() {
+        global $importer_started;
+        if ( time() - $importer_started > MAX_EXECUTION_TIME )
+            die('continue');
+        return true;
+    }
+    function get_total_results($type, $host) {
+        $headers = array(
+            "GET /feeds/$type/default?max-results=1&start-index=2 HTTP/1.0",
+            "Host: $host",
+            "Authorization: AuthSub token=\"$this->token\""
+        );
+        $request = join( "\r\n", $headers ) . "\r\n\r\n";
+        $sock = $this->_get_blogger_sock( $host );
+        if ( ! $sock ) return;
+        $response = $this->_txrx( $sock, $request );
+        $response = $this->parse_response( $response );
+        $parser = xml_parser_create();
+        xml_parse_into_struct($parser, $response['body'], $struct, $index);
+        xml_parser_free($parser);
+        $total_results = $struct[$index['OPENSEARCH:TOTALRESULTS'][0]]['value'];
+        return (int) $total_results;
+    }
+    function import_blog($blogID) {
+        global $importing_blog;
+        $importing_blog = $blogID;
+        if ( isset($_GET['authors']) )
+            return print($this->get_author_form());
+        header('Content-Type: text/plain');
+        if ( isset($_GET['status']) )
+            die($this->get_js_status());
+        if ( isset($_GET['saveauthors']) )
+            die($this->save_authors());
+        $blog = $this->blogs[$blogID];
+        $total_results = $this->get_total_results('posts', $blog['host']);
+        $this->blogs[$importing_blog]['total_posts'] = $total_results;
+        $start_index = $total_results - MAX_RESULTS + 1;
+        if ( isset( $this->blogs[$importing_blog]['posts_start_index'] ) )
+            $start_index = (int) $this->blogs[$importing_blog]['posts_start_index'];
+        elseif ( $total_results > MAX_RESULTS )
+            $start_index = $total_results - MAX_RESULTS + 1;
         else
+            echo "<p>$incompat</p>";
+        echo "</div>\n";
+    }
+    // Deletes saved data and redirect.
+            $start_index = 1;
+        // This will be positive until we have finished importing posts
+        if ( $start_index > 0 ) {
+            // Grab all the posts
+            $this->blogs[$importing_blog]['mode'] = 'posts';
+            $query = "start-index=$start_index&max-results=" . MAX_RESULTS;
+            do {
+                $index = $struct = $entries = array();
+                $headers = array(
+                    "GET /feeds/posts/default?$query HTTP/1.0",
+                    "Host: {$blog['host']}",
+                    "Authorization: AuthSub token=\"$this->token\""
+                );
+                $request = join( "\r\n", $headers ) . "\r\n\r\n";
+                $sock = $this->_get_blogger_sock( $blog['host'] );
+                if ( ! $sock ) return; // TODO: Error handling
+                $response = $this->_txrx( $sock, $request );
+                $response = $this->parse_response( $response );
+                // Extract the entries and send for insertion
+                preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );
+                if ( count( $matches[0] ) ) {
+                    $entries = array_reverse($matches[0]);
+                    foreach ( $entries as $entry ) {
+                        $entry = "<feed>$entry</feed>";
+                        $AtomParser = new AtomParser();
+                        $AtomParser->parse( $entry );
+                        $this->import_post($AtomParser->entry);
+                        unset($AtomParser);
+                    }
+                } else break;
+                // Get the 'previous' query string which we'll use on the next iteration
+                $query = '';
+                $links = preg_match_all('/<link([^>]*)>/', $response['body'], $matches);
+                if ( count( $matches[1] ) )
+                    foreach ( $matches[1] as $match )
+                        if ( preg_match('/rel=.previous./', $match) )
+                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+                if ( $query ) {
+                    parse_str($query, $q);
+                    $this->blogs[$importing_blog]['posts_start_index'] = (int) $q['start-index'];
+                } else
+                    $this->blogs[$importing_blog]['posts_start_index'] = 0;
+                $this->save_vars();
+            } while ( !empty( $query ) && $this->have_time() );
+        }
+        $total_results = $this->get_total_results( 'comments', $blog['host'] );
+        $this->blogs[$importing_blog]['total_comments'] = $total_results;
+        if ( isset( $this->blogs[$importing_blog]['comments_start_index'] ) )
+            $start_index = (int) $this->blogs[$importing_blog]['comments_start_index'];
+        elseif ( $total_results > MAX_RESULTS )
+            $start_index = $total_results - MAX_RESULTS + 1;
+        else
+            $start_index = 1;
+        if ( $start_index > 0 ) {
+            // Grab all the comments
+            $this->blogs[$importing_blog]['mode'] = 'comments';
+            $query = "start-index=$start_index&max-results=" . MAX_RESULTS;
+            do {
+                $index = $struct = $entries = array();
+                $headers = array(
+                    "GET /feeds/comments/default?$query HTTP/1.0",
+                    "Host: {$blog['host']}",
+                    "Authorization: AuthSub token=\"$this->token\""
+                );
+                $request = join( "\r\n", $headers ) . "\r\n\r\n";
+                $sock = $this->_get_blogger_sock( $blog['host'] );
+                if ( ! $sock ) return; // TODO: Error handling
+                $response = $this->_txrx( $sock, $request );
+                $response = $this->parse_response( $response );
+                // Extract the comments and send for insertion
+                preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );
+                if ( count( $matches[0] ) ) {
+                    $entries = array_reverse( $matches[0] );
+                    foreach ( $entries as $entry ) {
+                        $entry = "<feed>$entry</feed>";
+                        $AtomParser = new AtomParser();
+                        $AtomParser->parse( $entry );
+                        $this->import_comment($AtomParser->entry);
+                        unset($AtomParser);
+                    }
+                }
+                // Get the 'previous' query string which we'll use on the next iteration
+                $query = '';
+                $links = preg_match_all('/<link([^>]*)>/', $response['body'], $matches);
+                if ( count( $matches[1] ) )
+                    foreach ( $matches[1] as $match )
+                        if ( preg_match('/rel=.previous./', $match) )
+                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+                parse_str($query, $q);
+                $this->blogs[$importing_blog]['comments_start_index'] = (int) $q['start-index'];
+                $this->save_vars();
+            } while ( !empty( $query ) && $this->have_time() );
+        }
+        $this->blogs[$importing_blog]['mode'] = 'authors';
+        $this->save_vars();
+        if ( !$this->blogs[$importing_blog]['posts_done'] && !$this->blogs[$importing_blog]['comments_done'] )
+            die('nothing');
+        do_action('import_done', 'blogger');
+        die('done');
+    }
+    function convert_date( $date ) {
+        preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.[0-9]+)?(Z|[\+|\-][0-9]{2,4}){0,1}#', $date, $date_bits);
+        $offset = iso8601_timezone_to_offset( $date_bits[7] );
+        $timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);
+        $timestamp -= $offset; // Convert from Blogger local time to GMT
+        $timestamp += get_option('gmt_offset') * 3600; // Convert from GMT to WP local time
+        return gmdate('Y-m-d H:i:s', $timestamp);
+    }
+    function no_apos( $string ) {
+        return str_replace( '&apos;', "'", $string);
+    }
+    function min_whitespace( $string ) {
+        return preg_replace( '|\s+|', ' ', $string );
+    }
+    function import_post( $entry ) {
+        global $wpdb, $importing_blog;
+        // The old permalink is all Blogger gives us to link comments to their posts.
+        if ( isset( $entry->draft ) )
+            $rel = 'self';
+        else
+            $rel = 'alternate';
+        foreach ( $entry->links as $link ) {
+            if ( $link['rel'] == $rel ) {
+                $parts = parse_url( $link['href'] );
+                $entry->old_permalink = $parts['path'];
+                break;
+            }
+        }
+        $post_date    = $this->convert_date( $entry->published );
+        $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) );
+        $post_title   = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
+        $post_status  = isset( $entry->draft ) ? 'draft' : 'publish';
+        // Clean up content
+        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+        $post_content = str_replace('<br>', '<br />', $post_content);
+        $post_content = str_replace('<hr>', '<hr />', $post_content);
+        // Checks for duplicates
+        if (
+            isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ||
+            post_exists( $post_title, $post_content, $post_date )
+        ) {
+            ++$this->blogs[$importing_blog]['posts_skipped'];
+        } else {
+            $post = compact('post_date', 'post_content', 'post_title', 'post_status');
+            $post_id = wp_insert_post($post);
+            wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id );
+            $author = $this->no_apos( strip_tags( $entry->author ) );
+            add_post_meta( $post_id, 'blogger_blog', $this->blogs[$importing_blog]['host'], true );
+            add_post_meta( $post_id, 'blogger_author', $author, true );
+            add_post_meta( $post_id, 'blogger_permalink', $entry->old_permalink, true );
+            $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id;
+            ++$this->blogs[$importing_blog]['posts_done'];
+        }
+        $this->save_vars();
+    }
+    function import_comment( $entry ) {
+        global $importing_blog;
+        // Drop the #fragment and we have the comment's old post permalink.
+        foreach ( $entry->links as $link ) {
+            if ( $link['rel'] == 'alternate' ) {
+                $parts = parse_url( $link['href'] );
+                $entry->old_permalink = $parts['fragment'];
+                $entry->old_post_permalink = $parts['path'];
+                break;
+            }
+        }
+        $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink];
+        preg_match('#<name>(.+?)</name>.*(?:\<uri>(.+?)</uri>)?#', $entry->author, $matches);
+        $comment_author  = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
+        $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
+        $comment_date    = $this->convert_date( $entry->updated );
+        $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) );
+        // Clean up content
+        $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content);
+        $comment_content = str_replace('<br>', '<br />', $comment_content);
+        $comment_content = str_replace('<hr>', '<hr />', $comment_content);
+        // Checks for duplicates
+        if (
+            isset( $this->blogs[$importing_blog]['comments'][$entry->old_permalink] ) ||
+            comment_exists( $comment_author, $comment_date )
+        ) {
+            ++$this->blogs[$importing_blog]['comments_skipped'];
+        } else {
+            $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content');
+            $comment_id = wp_insert_comment($comment);
+            $this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id;
+            ++$this->blogs[$importing_blog]['comments_done'];
+        }
+        $this->save_vars();
+    }
+    function get_js_status($blog = false) {
+        global $importing_blog;
+        if ( $blog === false )
+            $blog = $this->blogs[$importing_blog];
+        else
+            $blog = $this->blogs[$blog];
+        $p1 = isset( $blog['posts_done'] ) ? (int) $blog['posts_done'] : 0;
+        $p2 = isset( $blog['total_posts'] ) ? (int) $blog['total_posts'] : 0;
+        $c1 = isset( $blog['comments_done'] ) ? (int) $blog['comments_done'] : 0;
+        $c2 = isset( $blog['total_comments'] ) ? (int) $blog['total_comments'] : 0;
+        return "{p1:$p1,p2:$p2,c1:$c1,c2:$c2}";
+    }
+    function get_author_form($blog = false) {
+        global $importing_blog, $wpdb, $current_user;
+        if ( $blog === false )
+            $blog = & $this->blogs[$importing_blog];
+        else
+            $blog = & $this->blogs[$blog];
+        if ( !isset( $blog['authors'] ) ) {
+            $post_ids = array_values($blog['posts']);
+            $authors = (array) $wpdb->get_col("SELECT DISTINCT meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN (" . join( ',', $post_ids ) . ")");
+            $blog['authors'] = array_map(null, $authors, array_fill(0, count($authors), $current_user->ID));
+            $this->save_vars();
+        }
+        $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user\'s posts to a different WordPress user. You may <a href="users.php">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the "Restart" function below.');
+        $heading = __('Author mapping');
+        $blogtitle = "{$blog['title']} ({$blog['host']})";
+        $mapthis = __('Blogger username');
+        $tothis = __('WordPress login');
+        $submit = js_escape( __('Save Changes &raquo;') );
+        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>";
+        return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='authorsubmit' value='$submit' /></td></tr></table></form></div>";
+    }
+    function get_user_options($current) {
+        global $wpdb, $importer_users;
+        if ( ! isset( $importer_users ) )
+            $importer_users = (array) get_users_of_blog();
+        foreach ( $importer_users as $user ) {
+            $sel = ( $user->user_id == $current ) ? " selected='selected'" : '';
+            $options .= "<option value='$user->user_id'$sel>$user->display_name</option>";
+        }
+        return $options;
+    }
+    function save_authors() {
+        global $importing_blog, $wpdb;
+        $authors = (array) $_POST['authors'];
+        $host = $this->blogs[$importing_blog]['host'];
+        // Get an array of posts => authors
+        $post_ids = (array) $wpdb->get_col("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'blogger_blog' AND meta_value = '$host'");
+        $post_ids = join( ',', $post_ids );
+        $results = (array) $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN ($post_ids)");
+        foreach ( $results as $row )
+            $authors_posts[$row->post_id] = $row->meta_value;
+        foreach ( $authors as $author => $user_id ) {
+            $user_id = (int) $user_id;
+            // Skip authors that haven't been changed
+            if ( $user_id == $this->blogs[$importing_blog]['authors'][$author][1] )
+                continue;
+            // Get a list of the selected author's posts
+            $post_ids = (array) array_keys( $authors_posts, $this->blogs[$importing_blog]['authors'][$author][0] );
+            $post_ids = join( ',', $post_ids);
+            $wpdb->query("UPDATE $wpdb->posts SET post_author = $user_id WHERE id IN ($post_ids)");
+            $this->blogs[$importing_blog]['authors'][$author][1] = $user_id;
+        }
+        $this->save_vars();
+        wp_redirect('edit.php');
+    }
+    function _get_auth_sock() {
+        // Connect to https://www.google.com
+        if ( !$sock = @ fsockopen('ssl://www.google.com', 443, $errno, $errstr) ) {
+            $this->uh_oh(
+                __('Could not connect to https://www.google.com'),
+                __('There was a problem opening a secure connection to Google. This is what went wrong:'),
+                "$errstr ($errno)"
+            );
+            return false;
+        }
+        return $sock;
+    }
+    function _get_blogger_sock($host = 'www2.blogger.com') {
+        if ( !$sock = @ fsockopen($host, 80, $errno, $errstr) ) {
+            $this->uh_oh(
+                sprintf( __('Could not connect to %s'), $host ),
+                __('There was a problem opening a connection to Blogger. This is what went wrong:'),
+                "$errstr ($errno)"
+            );
+            return false;
+        }
+        return $sock;
+    }
+    function _txrx( $sock, $request ) {
+        fwrite( $sock, $request );
+        while ( ! feof( $sock ) )
+            $response .= @ fread ( $sock, 8192 );
+        fclose( $sock );
+        return $response;
+    }
+    function revoke($token) {
+        $headers = array(
+            "GET /accounts/AuthSubRevokeToken HTTP/1.0",
+            "Authorization: AuthSub token=\"$token\""
+        );
+        $request = join( "\r\n", $headers ) . "\r\n\r\n";
+        $sock = $this->_get_auth_sock( );
+        if ( ! $sock ) return false;
+        $this->_txrx( $sock, $request );
+    }
     function restart() {
+        delete_option('import-blogger');
+        wp_redirect("admin.php?import=blogger");
+        die();
+    }
+    // Generates a string that will make the page reload in a specified interval.
+    function refresher($msec) {
+        if ( $msec )
+            return "<html><head><script type='text/javascript'>window.onload=setTimeout('window.location.reload()', $msec);</script>\n</head>\n<body>\n";
+        else
+            return "<html><head><script type='text/javascript'>window.onload=window.location.reload();</script>\n</head>\n<body>\n";
+        global $wpdb;
+        $options = get_option( 'blogger_importer' );
+        if ( isset( $options['token'] ) )
+            $this->revoke( $options['token'] );
+        delete_option('blogger_importer');
+        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = 'blogger_author'");
+        wp_redirect('?import=blogger');
+    }
 …
+    }
-    // Prints a form for the user to enter Blogger creds.
-    function login_form($text='') {
-        echo '<h1>' . __('Log in to Blogger') . "</h1>\n$text\n";
-        echo '<form method="post" action="admin.php?import=blogger&amp;noheader=true&amp;step=0"><table><tr><td>' . __('Username') . ':</td><td><input type="text" name="user" /></td></tr><tr><td>' . __('Password') . ':</td><td><input type="password" name="pass" /></td><td><input type="submit" value="' . __('Start') . '" /></td></tr></table></form>';
-        die;
+    }
-    // Sends creds to Blogger, returns the session cookies an array of headers.
-    function login_blogger($user, $pass) {
-        $_url = 'http://www.blogger.com/login.do';
-        $params = "username=$user&password=$pass";
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_POST,1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
-        curl_setopt($ch, CURLOPT_URL,$_url);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Blogger Exporter');
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-        curl_setopt($ch, CURLOPT_HEADER,1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-        $response = curl_exec ($ch);
-        $response = $this->parse_response($response);
-        sleep(1);
-        return $response['cookies'];
+    }
-    // Requests page from Blogger, returns the response array.
-    function get_blogger($url, $header = '', $user=false, $pass=false) {
-        $ch = curl_init();
-        if ($user && $pass) curl_setopt($ch, CURLOPT_USERPWD,"{$user}:{$pass}");
-        curl_setopt($ch, CURLOPT_URL,$url);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Blogger Exporter');
-        curl_setopt($ch, CURLOPT_HEADER,1);
-        if (is_array($header)) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-        $response = curl_exec ($ch);
-        $response = $this->parse_response($response);
-        $response['url'] = $url;
-        if (curl_errno($ch)) {
-            print curl_error($ch);
-        } else {
-            curl_close($ch);
+        }
-        return $response;
+    }
-    // Posts data to Blogger, returns response array.
-    function post_blogger($url, $header = false, $paramary = false, $parse=true) {
-        $params = '';
-        if ( is_array($paramary) ) {
-            foreach($paramary as $key=>$value)
-                if($key && $value != '')
-                    $params.=$key."=".urlencode(stripslashes($value))."&";
+        }
-        if ($user && $pass) $params .= "username=$user&password=$pass";
-        $params = trim($params,'&');
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_POST,1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
-        if ($user && $pass) curl_setopt($ch, CURLOPT_USERPWD,"{$user}:{$pass}");
-        curl_setopt($ch, CURLOPT_URL,$url);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Blogger Exporter');
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_HEADER,$parse);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-        if ($header) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-        $response = curl_exec ($ch);
-        if ($parse) {
-            $response = $this->parse_response($response);
-            $response['url'] = $url;
-            return $response;
+        }
-        return $response;
+    }
-    // Prints the list of blogs for import.
-    function show_blogs() {
-        global $import;
-        echo '<h1>' . __('Selecting a Blog') . "</h1>\n<ul>";
-        foreach ( $this->import['blogs'] as $blog ) {
-            if (9 == $blog['nextstep']) $status = "100%";
-            elseif (8 == $blog['nextstep']) $status = "90%";
-            elseif (7 == $blog['nextstep']) $status = "82.5%";
-            elseif (6 == $blog['nextstep']) $status = "75%";
-            elseif (5 == $blog['nextstep']) $status = "57%";
-            elseif (4 == $blog['nextstep']) $status = "28%";
-            elseif (3 == $blog['nextstep']) $status = "14%";
-            else $status = "0%";
-            echo "\t<li><a href='admin.php?import=blogger&amp;noheader=true&amp;blog={$blog['id']}'>{$blog['title']}</a> $status</li>\n";
+        }
-        die("</ul>\n");
+    }
-    // Publishes.
-    function publish_blogger($i, $text) {
-        $head = $this->refresher(2000) . "<h1>$text</h1>\n";
-        if ( ! strstr($this->import['blogs'][$_GET['blog']]['publish'][$i], 'http') ) {
-            // First call. Start the publish process with a fresh set of cookies.
-            $this->import['cookies'] = $this->login_blogger($this->import['user'], $this->import['pass']);
-            update_option('import-blogger', $this->import);
-            $paramary = array('blogID' => $_GET['blog'], 'all' => '1', 'republishAll' => 'Republish Entire Blog', 'publish' => '1', 'redirectUrl' => "/publish.do?blogID={$_GET['blog']}&inprogress=true");
-            $response = $this->post_blogger("http://www.blogger.com/publish.do?blogID={$_GET['blog']}", $this->import['cookies'], $paramary);
-            if ( $response['code'] == '302' ) {
-                $url = str_replace('publish.g', 'publish-body.g', $response['header']['Location']);
-                $this->import['blogs'][$_GET['blog']]['publish'][$i] = $url;
-                update_option('import-blogger', $this->import);
-                $response = $this->get_blogger($url, $this->import['cookies']);
-                preg_match('#<p class="progressIndicator">.*</p>#U', $response['body'], $matches);
-                $progress = $matches[0];
-                die($head . $progress);
-            } else {
-                $this->import['blogs'][$_GET['blog']]['publish'][$i] = false;
-                update_option('import-blogger', $this->import);
-                die($head);
+            }
-        } else {
-            // Subsequent call. Keep checking status until Blogger reports publish complete.
-            $url = $this->import['blogs'][$_GET['blog']]['publish'][$i];
-            $response = $this->get_blogger($url, $this->import['cookies']);
-            if ( preg_match('#<p class="progressIndicator">.*</p>#U', $response['body'], $matches) ) {
-                $progress = $matches[0];
-                if ( strstr($progress, '100%') ) {
-                    $this->set_next_step($i);
-                    $progress .= '<p>'.__('Moving on...').'</p>';
+                }
-                die($head . $progress);
-            } else {
-                $this->import['blogs'][$_GET['blog']]['publish'][$i] = false;
-                update_option('import-blogger', $this->import);
-                die("$head<p>" . __('Trying again...') . '</p>');
+            }
+        }
+    }
-    // Sets next step, saves options
-    function set_next_step($step) {
-        $this->import['blogs'][$_GET['blog']]['nextstep'] = $step;
-        update_option('import-blogger', $this->import);
+    }
-    // Redirects to next step
-    function do_next_step() {
-        wp_redirect("admin.php?import=blogger&noheader=true&blog={$_GET['blog']}");
-        die();
+    }
-    // Step 0: Do Blogger login, get blogid/title pairs.
-    function do_login() {
-        if ( ( ! $this->import['user'] && ! is_array($this->import['cookies']) ) ) {
-            // The user must provide a Blogger username and password.
-            if ( ! ( $_POST['user'] && $_POST['pass'] ) ) {
-                $this->login_form(__('The script will log into your Blogger account, change some settings so it can read your blog, and restore the original settings when it\'s done. Here\'s what you do:').'</p><ol><li>'.__('Back up your Blogger template.').'</li><li>'.__('Back up any other Blogger settings you might need later.').'</li><li>'.__('Log out of Blogger').'</li><li>'.__('Log in <em>here</em> with your Blogger username and password.').'</li><li>'.__('On the next screen, click one of your Blogger blogs.').'</li><li>'.__('Do not close this window or navigate away until the process is complete.').'</li></ol>');
+            }
-            // Try logging in. If we get an array of cookies back, we at least connected.
-            $this->import['cookies'] = $this->login_blogger($_POST['user'], $_POST['pass']);
-            if ( !is_array( $this->import['cookies'] ) ) {
-                $this->login_form(__('Login failed. Please enter your credentials again.'));
+            }
-            // Save the password so we can log the browser in when it's time to publish.
-            $this->import['pass'] = $_POST['pass'];
-            $this->import['user'] = $_POST['user'];
-            // Get the Blogger welcome page and scrape the blog numbers and names from it
-            $response = $this->get_blogger('http://www.blogger.com/home', $this->import['cookies']);
-            if (! stristr($response['body'], 'signed in as') ) $this->login_form(__('Login failed. Please re-enter your username and password.'));
-            $blogsary = array();
-            preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)</a>#U', $response['body'], $blogsary);
-            if ( ! count( $blogsary[1] < 1 ) )
-                wp_die(__('No blogs found for this user.'));
-            $this->import['blogs'] = array();
-            $template = '<MainPage><br /><br /><br /><p>'.__('Are you looking for %title%? It is temporarily out of service. Please try again in a few minutes. Meanwhile, discover <a href="http://wordpress.org/">a better blogging tool</a>.').'</p><BloggerArchives><a class="archive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br /></BloggerArchives></MainPage><ArchivePage><Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger></ArchivePage>';
-            foreach ( $blogsary[1] as $key => $id ) {
-                // Define the required Blogger options.
-                $blog_opts = array(
-                    'blog-options-basic' => false,
-                    'blog-options-archiving' => array('archiveFrequency' => 'm'),
-                    'blog-publishing' => array('publishMode'=>'0', 'blogID' => "$id", 'subdomain' => mt_rand().mt_rand(), 'pingWeblogs' => 'false'),
-                    'blog-formatting' => array('timeStampFormat' => '0', 'encoding'=>'UTF-8', 'convertLineBreaks'=>'false', 'floatAlignment'=>'false'),
-                    'blog-comments' => array('commentsTimeStampFormat' => '0'),
-                    'template-edit' => array( 'templateText' =>  str_replace('%title%', trim($blogsary[2][$key]), $template) )
-                );
-                // Build the blog options array template
-                foreach ($blog_opts as $blog_opt => $modify)
-                    $new_opts["$blog_opt"] = array('backup'=>false, 'modify' => $modify, 'error'=>false);
-                $this->import['blogs']["$id"] = array(
-                    'id' => $id,
-                    'title' => trim($blogsary[2][$key]),
-                    'options' => $new_opts,
-                    'url' => false,
-                    'publish_cookies' => false,
-                    'published' => false,
-                    'archives' => false,
-                    'lump_authors' => false,
-                    'newusers' => array(),
-                    'nextstep' => 2
-                );
+            }
-            update_option('import-blogger', $this->import);
-            wp_redirect("admin.php?import=blogger&noheader=true&step=1");
+        }
-        die();
+    }
-    // Step 1: Select one of the blogs belonging to the user logged in.
-    function select_blog() {
-        if ( is_array($this->import['blogs']) ) {
-            $this->show_blogs();
-            die();
-        } else {
-            $this->restart();
+        }
+    }
-    // Step 2: Backup the Blogger options pages, updating some of them.
-    function backup_settings() {
-        $output.= '<h1>'.__('Backing up Blogger options')."</h1>\n";
-        $form = false;
-        foreach ($this->import['blogs'][$_GET['blog']]['options'] as $blog_opt => $optary) {
-            if ( $blog_opt == $_GET['form'] ) {
-                // Save the posted form data
-                $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup'] = $_POST;
-                update_option('import-blogger',$this->import);
-                // Post the modified form data to Blogger
-                if ( $optary['modify'] ) {
-                    $posturl = "http://www.blogger.com/{$blog_opt}.do";
-                    $headers = array_merge($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'], $this->import['cookies']);
-                    if ( 'blog-publishing' == $blog_opt ) {
-                        if ( $_POST['publishMode'] > 0 ) {
-                            $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);
-                            if ( $response['code'] >= 400 )
-                                wp_die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');
-                            $this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';
-                            sleep(2);
-                        } else {
-                            $this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $_POST['subdomain'] . '.blogspot.com/';
-                            update_option('import-blogger', $this->import);
-                            $output .= "<del><p>$blog_opt</p></del>\n";
-                            continue;
+                        }
-                        $paramary = $optary['modify'];
-                    } else {
-                        $paramary = array_merge($_POST, $optary['modify']);
+                    }
-                    $response = $this->post_blogger($posturl, $headers, $paramary);
-                    if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )
-                        wp_die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));
+                }
-                $output .= "<del><p>$blog_opt</p></del>\n";
-            } elseif ( is_array($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup']) ) {
-                // This option set has already been backed up.
-                $output .= "<del><p>$blog_opt</p></del>\n";
-            } elseif ( ! $form ) {
-                // This option page needs to be downloaded and given to the browser for submission back to this script.
-                $response = $this->get_blogger("http://www.blogger.com/{$blog_opt}.g?blogID={$_GET['blog']}", $this->import['cookies']);
-                $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'] = $response['cookies'];
-                update_option('import-blogger',$this->import);
-                $body = $response['body'];
-                $body = preg_replace("|\<!DOCTYPE.*\<body[^>]*>|ms","",$body);
-                $body = preg_replace("|/?{$blog_opt}.do|","admin.php?import=blogger&amp;noheader=true&amp;step=2&amp;blog={$_GET['blog']}&amp;form={$blog_opt}",$body);
-                $body = str_replace("name='submit'","name='supermit'",$body);
-                $body = str_replace('name="submit"','name="supermit"',$body);
-                $body = str_replace('</body>','',str_replace('</html>','',$body));
-                $form = "<div style='height:0px;width:0px;overflow:hidden;'>";
-                $form.= $body;
-                $form.= "</div><script type='text/javascript'>forms=document.getElementsByTagName('form');for(i=0;i<forms.length;i++){if(forms[i].action.search('{$blog_opt}')){forms[i].submit();break;}}</script>";
-                $output.= '<p>'.sprintf(__('<strong>%s</strong> in progress, please wait...'), $blog_opt)."</p>\n";
-            } else {
-                $output.= "<p>$blog_opt</p>\n";
+            }
+        }
-        if ( $form )
-            die($output . $form);
-        $this->set_next_step(4);
-        $this->do_next_step();
+    }
-    // Step 3: Cancelled :-)
-    // Step 4: Publish with the new template and settings.
-    function publish_blog() {
-        $this->publish_blogger(5, __('Publishing with new template and options'));
+    }
-    // Step 5: Get the archive URLs from the new blog.
-    function get_archive_urls() {
-        $bloghtml = $this->get_blogger($this->import['blogs'][$_GET['blog']]['url']);
-        if (! strstr($bloghtml['body'], '<a class="archive"') )
-            wp_die(__('Your Blogger blog did not take the new template or did not respond.'));
-        preg_match_all('#<a class="archive" href="([^"]*)"#', $bloghtml['body'], $archives);
-        foreach ($archives[1] as $archive) {
-            $this->import['blogs'][$_GET['blog']]['archives'][$archive] = false;
+        }
-        $this->set_next_step(6);
-        $this->do_next_step();
+    }
-    // Step 6: Get each monthly archive, import it, mark it done.
-    function get_archive() {
-        global $wpdb;
-        $output = '<h2>'.__('Importing Blogger archives into WordPress').'</h2>';
-        $did_one = false;
-        $post_array = $posts = array();
-        foreach ( $this->import['blogs'][$_GET['blog']]['archives'] as $url => $status ) {
-            $archivename = substr(basename($url),0,7);
-            if ( $status || $did_one ) {
-                $foo = 'bar';
-                // Do nothing.
-            } else {
-                // Import the selected month
-                $postcount = 0;
-                $skippedpostcount = 0;
-                $commentcount = 0;
-                $skippedcommentcount = 0;
-                $status = __('in progress...');
-                $this->import['blogs'][$_GET['blog']]['archives']["$url"] = $status;
-                update_option('import-blogger', $import);
-                $archive = $this->get_blogger($url);
-                if ( $archive['code'] > 200 )
-                    continue;
-                $posts = explode('<wordpresspost>', $archive['body']);
-                for ($i = 1; $i < count($posts); $i = $i + 1) {
-                    $postparts = explode('<wordpresscomment>', $posts[$i]);
-                    $postinfo = explode('|W|P|', $postparts[0]);
-                    $post_date = $postinfo[0];
-                    $post_content = $postinfo[2];
-                    // Don't try to re-use the original numbers
-                    // because the new, longer numbers are too
-                    // big to handle as ints.
-                    //$post_number = $postinfo[3];
-                    $post_title = ( $postinfo[4] != '' ) ? $postinfo[4] : $postinfo[3];
-                    $post_author_name = $wpdb->escape(trim($postinfo[1]));
-                    $post_author_email = $postinfo[5] ? $postinfo[5] : 'user@wordpress.org';
-                    if ( $this->lump_authors ) {
-                        // Ignore Blogger authors. Use the current user_ID for all posts imported.
-                        $post_author = $GLOBALS['user_ID'];
-                    } else {
-                        // Add a user for each new author encountered.
-                        if (! username_exists($post_author_name) ) {
-                            $user_login = $wpdb->escape($post_author_name);
-                            $user_email = $wpdb->escape($post_author_email);
-                            $user_password = substr(md5(uniqid(microtime())), 0, 6);
-                            $result = wp_create_user( $user_login, $user_password, $user_email );
-                            $status.= sprintf(__('Registered user <strong>%s</strong>.'), $user_login);
-                            $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login;
+                        }
-                        $userdata = get_userdatabylogin( $post_author_name );
-                        $post_author = $userdata->ID;
+                    }
-                    $post_date = explode(' ', $post_date);
-                    $post_date_Ymd = explode('/', $post_date[0]);
-                    $postyear = $post_date_Ymd[2];
-                    $postmonth = zeroise($post_date_Ymd[0], 2);
-                    $postday = zeroise($post_date_Ymd[1], 2);
-                    $post_date_His = explode(':', $post_date[1]);
-                    $posthour = zeroise($post_date_His[0], 2);
-                    $postminute = zeroise($post_date_His[1], 2);
-                    $postsecond = zeroise($post_date_His[2], 2);
-                    if (($post_date[2] == 'PM') && ($posthour != '12'))
-                        $posthour = $posthour + 12;
-                    else if (($post_date[2] == 'AM') && ($posthour == '12'))
-                        $posthour = '00';
-                    $post_date = "$postyear-$postmonth-$postday $posthour:$postminute:$postsecond";
-                    $post_content = addslashes($post_content);
-                    $post_content = str_replace(array('<br>','<BR>','<br/>','<BR/>','<br />','<BR />'), "\n", $post_content); // the XHTML touch... ;)
-                    $post_title = addslashes($post_title);
-                    $post_status = 'publish';
-                    if ( $ID = post_exists($post_title, '', $post_date) ) {
-                        $post_array[$i]['ID'] = $ID;
-                        $skippedpostcount++;
-                    } else {
-                        $post_array[$i]['post'] = compact('post_author', 'post_content', 'post_title', 'post_category', 'post_author', 'post_date', 'post_status');
-                        $post_array[$i]['comments'] = false;
+                    }
-                    // Import any comments attached to this post.
-                    if ($postparts[1]) :
-                    for ($j = 1; $j < count($postparts); $j = $j + 1) {
-                        $commentinfo = explode('|W|P|', $postparts[$j]);
-                        $comment_date = explode(' ', $commentinfo[0]);
-                        $comment_date_Ymd = explode('/', $comment_date[0]);
-                        $commentyear = $comment_date_Ymd[2];
-                        $commentmonth = zeroise($comment_date_Ymd[0], 2);
-                        $commentday = zeroise($comment_date_Ymd[1], 2);
-                        $comment_date_His = explode(':', $comment_date[1]);
-                        $commenthour = zeroise($comment_date_His[0], 2);
-                        $commentminute = zeroise($comment_date_His[1], 2);
-                        $commentsecond = '00';
-                        if (($comment_date[2] == 'PM') && ($commenthour != '12'))
-                            $commenthour = $commenthour + 12;
-                        else if (($comment_date[2] == 'AM') && ($commenthour == '12'))
-                            $commenthour = '00';
-                        $comment_date = "$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
-                        $comment_author = addslashes(strip_tags($commentinfo[1]));
-                        if ( strpos($commentinfo[1], 'a href') ) {
-                            $comment_author_parts = explode('&quot;', htmlentities($commentinfo[1]));
-                            $comment_author_url = $comment_author_parts[1];
-                        } else $comment_author_url = '';
-                        $comment_content = $commentinfo[2];
-                        $comment_content = str_replace(array('<br>','<BR>','<br/>','<BR/>','<br />','<BR />'), "\n", $comment_content);
-                        $comment_approved = 1;
-                        if ( comment_exists($comment_author, $comment_date) ) {
-                            $skippedcommentcount++;
-                        } else {
-                            $comment = compact('comment_author', 'comment_author_url', 'comment_date', 'comment_content', 'comment_approved');
-                            $post_array[$i]['comments'][$j] = wp_filter_comment($comment);
+                        }
-                        $commentcount++;
+                    }
-                    endif;
-                    $postcount++;
+                }
-                if ( count($post_array) ) {
-                    krsort($post_array);
-                    foreach($post_array as $post) {
-                        if ( ! $comment_post_ID = $post['ID'] )
-                            $comment_post_ID = wp_insert_post($post['post']);
-                        if ( $post['comments'] ) {
-                            foreach ( $post['comments'] as $comment ) {
-                                $comment['comment_post_ID'] = $comment_post_ID;
-                                wp_insert_comment($comment);
+                            }
+                        }
+                    }
+                }
-                $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount,  $skippedpostcount).' '.
-                    sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '.
-                    ' <strong>'.__('Done').'</strong>';
-                $import = $this->import;
-                $import['blogs'][$_GET['blog']]['archives']["$url"] = $status;
-                update_option('import-blogger', $import);
-                $did_one = true;
+            }
-            $output.= "<p>$archivename $status</p>\n";
+        }
-        if ( ! $did_one )
-            $this->set_next_step(7);
-        die( $this->refresher(1000) . $output );
+    }
-    // Step 7: Restore the backed-up settings to Blogger
-    function restore_settings() {
-        $output = '<h1>'.__('Restoring your Blogger options')."</h1>\n";
-        $did_one = false;
-        // Restore options in reverse order.
-        if ( ! $this->import['reversed'] ) {
-            $this->import['blogs'][$_GET['blog']]['options'] = array_reverse($this->import['blogs'][$_GET['blog']]['options'], true);
-            $this->import['reversed'] = true;
-            update_option('import-blogger', $this->import);
+        }
-        foreach ( $this->import['blogs'][$_GET['blog']]['options'] as $blog_opt => $optary ) {
-            if ( $did_one ) {
-                $output .= "<p>$blog_opt</p>\n";
-            } elseif ( $optary['restored'] || ! $optary['modify'] ) {
-                $output .= "<p><del>$blog_opt</del></p>\n";
-            } else {
-                $posturl = "http://www.blogger.com/{$blog_opt}.do";
-                $headers = array_merge($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['cookies'], $this->import['cookies']);
-                if ( 'blog-publishing' == $blog_opt) {
-                    if ( $optary['backup']['publishMode'] > 0 ) {
-                        $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers);
-                        sleep(2);
-                        if ( $response['code'] >= 400 )
-                            wp_die('<h1>'.__('Error restoring publishMode').'</h1><p>'.__('Please tell the devs.').'</p>' . addslashes(print_r($response, 1)) );
+                    }
+                }
-                if ( $optary['backup'] != $optary['modify'] ) {
-                    $response = $this->post_blogger($posturl, $headers, $optary['backup']);
-                    if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') ) {
-                        $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['error'] = true;
-                        update_option('import-blogger', $this->import);
-                        $output .= sprintf(__('%s failed. Trying again.'), "<p><strong>$blog_opt</strong> ").'</p>';
-                    } else {
-                        $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['restored'] = true;
-                        update_option('import-blogger', $this->import);
-                        $output .= sprintf(__('%s restored.'), "<p><strong>$blog_opt</strong> ").'</p>';
+                    }
+                }
-                $did_one = true;
+            }
+        }
-        if ( $did_one ) {
-            die( $this->refresher(1000) . $output );
-        } elseif ( $this->import['blogs'][$_GET['blog']]['options']['blog-publishing']['backup']['publishMode'] > 0 ) {
-            $this->set_next_step(9);
-        } else {
-            $this->set_next_step(8);
+        }
-        $this->do_next_step();
+    }
-    // Step 8: Republish, all back to normal
-    function republish_blog() {
-        $this->publish_blogger(9, __('Publishing with original template and options'));
+    }
     // Step 9: Congratulate the user
     function congrats() {
+        $blog = (int) $_GET['blog'];
         echo '<h1>'.__('Congratulations!').'</h1><p>'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'</p><ul><li>'.__('That was hard work! Take a break.').'</li>';
         if ( count($this->import['blogs']) > 1 )
             echo '<li>'.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . '</li>';
         if ( $n = count($this->import['blogs'][$_GET['blog']]['newusers']) )
+        if ( $n = count($this->import['blogs'][$blog]['newusers']) )
             echo '<li>'.sprintf(__('Go to <a href="%s" target="%s">Authors &amp; Users</a>, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'</li>';
         echo '<li>'.__('For security, click the link below to reset this importer. That will clear your Blogger credentials and options from the database.').'</li>';
+        echo '<li>'.__('For security, click the link below to reset this importer.').'</li>';
         echo '</ul>';
+    }
 …
     // Figures out what to do, then does it.
     function start() {
         if ( $_GET['restart'] == 'true' ) {
+        if ( isset($_POST['restart']) )
             $this->restart();
+        }
+        if ( isset($_GET['noheader']) ) {
+            header('Content-Type: text/html; charset=utf-8');
+            $this->import = get_option('import-blogger');
+            if ( false === $this->import ) {
+                $step = 0;
+            } elseif ( isset($_GET['step']) ) {
+                $step = (int) $_GET['step'];
+            } elseif ( isset($_GET['blog']) && isset($this->import['blogs'][$_GET['blog']]['nextstep']) ) {
+                $step = $this->import['blogs'][$_GET['blog']]['nextstep'];
+            } elseif ( is_array($this->import['blogs']) ) {
+                $step = 1;
+        $options = get_option('blogger_importer');
+        if ( is_array($options) )
+            foreach ( $options as $key => $value )
+                $this->$key = $value;
+        if ( isset( $_REQUEST['blog'] ) ) {
+            $blog = is_array($_REQUEST['blog']) ? array_shift( array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog'];
+            $blog = (int) $blog;
+            $this->import_blog( $blog );
+        } elseif ( isset($_GET['token']) )
+            $this->auth();
+        elseif ( $this->token && $this->token_is_valid() )
+            $this->show_blogs();
+        else
+            $this->greet();
+        $saved = $this->save_vars();
+        if ( $saved && !isset($_GET['noheader']) ) {
+            $restart = __('Restart');
+            $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.');
+            $submit = __('Clear account information');
+            echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' value='$submit' name='restart' /></p></form></div>";
+        }
+    }
+    function save_vars() {
+        $vars = get_object_vars($this);
+        update_option( 'blogger_importer', $vars );
+        return !empty($vars);
+    }
+    function admin_head() {
+?>
+<style type="text/css">
+td { text-align: center; line-height: 2em;}
+thead td { font-weight: bold; }
+.bar {
+    width: 200px;
+    text-align: left;
+    line-height: 2em;
+    padding: 0px;
+}
+.ind {
+    position: absolute;
+    background-color: #83B4D8;
+    width: 1px;
+    z-index: 9;
+}
+.stat {
+    z-index: 10;
+    position: relative;
+    text-align: center;
+}
+.submit {
+    text-align: center !important;
+}
+</style>
+<?php
+    }
+    function Blogger_Import() {
+        global $importer_started;
+        $importer_started = time();
+        if ( isset( $_GET['import'] ) && $_GET['import'] == 'blogger' ) {
+            wp_enqueue_script('jquery');
+            add_action('admin_head', array(&$this, 'admin_head'));
+        }
+    }
+}
+$blogger_import = new Blogger_Import();
+register_importer('blogger', __('Blogger'), __('Import posts, comments, and users from a Blogger blog'), array ($blogger_import, 'start'));
+class AtomEntry {
+    var $links = array();
+    var $categories = array();
+}
+class AtomParser {
+    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
+    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft','author');
+    var $depth = 0;
+    var $indent = 2;
+    var $in_content;
+    var $ns_contexts = array();
+    var $ns_decls = array();
+    var $is_xhtml = false;
+    var $skipped_div = false;
+    var $entry;
+    function AtomParser() {
+        $this->entry = new AtomEntry();
+        $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";');
+        $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";');
+    }
+    function parse($xml) {
+        global $app_logging;
+        array_unshift($this->ns_contexts, array());
+        $parser = xml_parser_create_ns();
+        xml_set_object($parser, $this);
+        xml_set_element_handler($parser, "start_element", "end_element");
+        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
+        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+        xml_set_character_data_handler($parser, "cdata");
+        xml_set_default_handler($parser, "_default");
+        xml_set_start_namespace_decl_handler($parser, "start_ns");
+        xml_set_end_namespace_decl_handler($parser, "end_ns");
+        $contents = "";
+        xml_parse($parser, $xml);
+        xml_parser_free($parser);
+        return true;
+    }
+    function start_element($parser, $name, $attrs) {
+        $tag = array_pop(split(":", $name));
+        array_unshift($this->ns_contexts, $this->ns_decls);
+        $this->depth++;
+        if(!empty($this->in_content)) {
+            $attrs_prefix = array();
+            // resolve prefixes for attributes
+            foreach($attrs as $key => $value) {
+                $attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value);
+            }
+            $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
+            if(strlen($attrs_str) > 0) {
+                $attrs_str = " " . $attrs_str;
+            }
+            $xmlns_str = join(' ', array_map($this->map_xmlns_func, array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0])));
+            if(strlen($xmlns_str) > 0) {
+                $xmlns_str = " " . $xmlns_str;
+            }
+            // handle self-closing tags (case: a new child found right-away, no text node)
+            if(count($this->in_content) == 2) {
+                array_push($this->in_content, ">");
+            }
+            array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}");
+        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+            $this->in_content = array();
+            $this->is_xhtml = $attrs['type'] == 'xhtml';
+            array_push($this->in_content, array($tag,$this->depth));
+        } else if($tag == 'link') {
+            array_push($this->entry->links, $attrs);
+        } else if($tag == 'category') {
+            array_push($this->entry->categories, $attrs['term']);
+        }
+        $this->ns_decls = array();
+    }
+    function end_element($parser, $name) {
+        $tag = array_pop(split(":", $name));
+        if(!empty($this->in_content)) {
+            if($this->in_content[0][0] == $tag &&
+            $this->in_content[0][1] == $this->depth) {
+                array_shift($this->in_content);
+                if($this->is_xhtml) {
+                    $this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3);
+                }
+                $this->entry->$tag = join('',$this->in_content);
+                $this->in_content = array();
             } else {
+                $step = 0;
+            }
+//echo "Step $step.";
+//wp_die('<pre>'.print_r($this->import,1).'</pre');
+            switch ($step) {
+                case 0 :
+                    $this->do_login();
+                    break;
+                case 1 :
+                    $this->select_blog();
+                    break;
+                case 2 :
+                    $this->backup_settings();
+                    break;
+                case 3 :
+                    $this->wait_for_blogger();
+                    break;
+                case 4 :
+                    $this->publish_blog();
+                    break;
+                case 5 :
+                    $this->get_archive_urls();
+                    break;
+                case 6 :
+                    $this->get_archive();
+                    break;
+                case 7 :
+                    $this->restore_settings();
+                    break;
+                case 8 :
+                    $this->republish_blog();
+                    break;
+                case 9 :
+                    $this->congrats();
+                    break;
+            }
+            die;
+        } else {
+            $this->greet();
+        }
+    }
+    function Blogger_Import() {
+        // This space intentionally left blank.
+                $endtag = $this->ns_to_prefix($name);
+                if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) {
+                    array_push($this->in_content, "/>");
+                } else {
+                    array_push($this->in_content, "</$endtag>");
+                }
+            }
+        }
+        array_shift($this->ns_contexts);
+        #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";
+        $this->depth--;
+    }
+    function start_ns($parser, $prefix, $uri) {
+        #print str_repeat(" ", $this->depth * $this->indent) . "starting: " . $prefix . ":" . $uri . "\n";
+        array_push($this->ns_decls, array($prefix,$uri));
+    }
+    function end_ns($parser, $prefix) {
+        #print str_repeat(" ", $this->depth * $this->indent) . "ending: #" . $prefix . "#\n";
+    }
+    function cdata($parser, $data) {
+        #print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n";
+        if(!empty($this->in_content)) {
+            // handle self-closing tags (case: text node found, need to close element started)
+            if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
+                array_push($this->in_content, ">");
+            }
+            array_push($this->in_content, $this->xml_escape($data));
+        }
+    }
+    function _default($parser, $data) {
+        # when does this gets called?
+    }
+    function ns_to_prefix($qname) {
+        $components = split(":", $qname);
+        $name = array_pop($components);
+        if(!empty($components)) {
+            $ns = join(":",$components);
+            foreach($this->ns_contexts as $context) {
+                foreach($context as $mapping) {
+                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+                        return "$mapping[0]:$name";
+                    }
+                }
+            }
+        }
+        return $name;
+    }
+    function xml_escape($string)
+    {
+             return str_replace(array('&','"',"'",'<','>'),
+                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
+                $string );
+    }
+}
-$blogger_import = new Blogger_Import();
-register_importer('blogger', __('Old Blogger'), __('Import posts, comments, and users from an Old Blogger blog'), array ($blogger_import, 'start'));
 ?>

tags/2.2/wp-admin/import/dotclear.php

-                      r5468
+                      r5480
         echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
+        wp_nonce_field('import-dotclear');
         $this->db_form();
         echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
+        echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories &raquo;')).'" /></p>';
         echo '</form></div>';
+    }
 …
         echo '<form action="admin.php?import=dotclear&amp;step=2" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Users'));
+        wp_nonce_field('import-dotclear');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users')));
         echo '</form>';
 …
         echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Posts'));
+        wp_nonce_field('import-dotclear');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Comments'));
+        wp_nonce_field('import-dotclear');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=dotclear&amp;step=5" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Links'));
+        wp_nonce_field('import-dotclear');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=dotclear&amp;step=6" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Finish'));
+        wp_nonce_field('import-dotclear');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish')));
         echo '</form>';
+    }
 …
         if ( $step > 0 )
+        {
+            check_admin_referer('import-dotclear');
             if($_POST['dbuser'])
+            {
                 if(get_option('dcuser'))
                     delete_option('dcuser');
                 add_option('dcuser',$_POST['dbuser']);
+                add_option('dcuser', sanitize_user($_POST['dbuser'], true));
+            }
             if($_POST['dbpass'])
 …
                 if(get_option('dcpass'))
                     delete_option('dcpass');
                 add_option('dcpass',$_POST['dbpass']);
+                add_option('dcpass', sanitize_user($_POST['dbpass'], true));
+            }
 …
                 if(get_option('dcname'))
                     delete_option('dcname');
                 add_option('dcname',$_POST['dbname']);
+                add_option('dcname', sanitize_user($_POST['dbname'], true));
+            }
             if($_POST['dbhost'])
 …
                 if(get_option('dchost'))
                     delete_option('dchost');
                 add_option('dchost',$_POST['dbhost']);
+                add_option('dchost', sanitize_user($_POST['dbhost'], true));
+            }
             if($_POST['dccharset'])
 …
                 if(get_option('dccharset'))
                     delete_option('dccharset');
                 add_option('dccharset',$_POST['dccharset']);
+                add_option('dccharset', sanitize_user($_POST['dccharset'], true));
+            }
             if($_POST['dbprefix'])
 …
                 if(get_option('dcdbprefix'))
                     delete_option('dcdbprefix');
                 add_option('dcdbprefix',$_POST['dbprefix']);
+                add_option('dcdbprefix', sanitize_user($_POST['dbprefix'], true));
+            }

tags/2.2/wp-admin/import/greymatter.php

-                      r5468
+                      r5480
 <input type="hidden" name="import" value="greymatter" />
 <input type="hidden" name="step" value="1" />
+<?php wp_nonce_field('import-greymatter'); ?>
 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
 <p><table cellpadding="0">
 …
         if (!chdir($archivespath))
             wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $archivespath));
+            wp_die(__("Wrong path, the path to the GM entries does not exist on the server"));
         if (!chdir($gmpath))
+            wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
+            wp_die(__("Wrong path, the path to the GM files does not exist on the server"));
+        $lastentry = (int) $lastentry;
         $this->header();
 ?>
 …
         $user_id = wp_insert_user($user_info);
         $this->gmnames[$userdata[0]] = $user_id;
         printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
+    }
 …
                     $user_url=$wpdb->escape("");
                     $user_joindate=$wpdb->escape($user_joindate);
                     $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
                     $user_id = wp_insert_user($user_info);
                     $this->gmnames[$postinfo[1]] = $user_id;
                     echo ': ';
                     printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
+                }
                 if (array_key_exists($postinfo[1], $this->gmnames)) {
                     $post_author = $this->gmnames[$postinfo[1]];
 …
                     $post_author = $user_id;
+                }
                 $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
                 $post_ID = wp_insert_post($postdata);
 …
                 break;
             case 1:
+                check_admin_referer('import-greymatter');
                 $this->import();
                 break;

tags/2.2/wp-admin/import/livejournal.php

r5468	r5480
154	154	break;
155	155	case 1 :
	156	check_admin_referer('import-upload');
156	157	$this->import();
157	158	break;

tags/2.2/wp-admin/import/mt.php

-                      r5468
+                      r5480
         echo '<ol id="authors">';
         echo '<form action="?import=mt&amp;step=2&amp;id=' . $this->id . '" method="post">';
+        wp_nonce_field('import-mt');
         $j = -1;
         foreach ($authors as $author) {
 …
                 break;
             case 1 :
+                check_admin_referer('import-upload');
                 $this->select_authors();
                 break;
             case 2:
+                check_admin_referer('import-mt');
                 $this->import();
                 break;

tags/2.2/wp-admin/import/rss.php

r5468	r5480
157	157	break;
158	158	case 1 :
	159	check_admin_referer('import-upload');
159	160	$this->import();
160	161	break;

tags/2.2/wp-admin/import/textpattern.php

-                      r5468
+                      r5480
         echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
         echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
+        wp_nonce_field('import-textpattern');
         $this->db_form();
         echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
+        echo '<p class="submit"><input type="submit" name="submit" value="'.attribute_escape(__('Import Categories &raquo;')).'" /></p>';
         echo '</form>';
         echo '</div>';
 …
         echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Users'));
+        wp_nonce_field('import-textpattern');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Users')));
         echo '</form>';
 …
         echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Posts'));
+        wp_nonce_field('import-textpattern');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Posts')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Comments'));
+        wp_nonce_field('import-textpattern');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Comments')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Import Links'));
+        wp_nonce_field('import-textpattern');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Import Links')));
         echo '</form>';
+    }
 …
         echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
+        printf('<input type="submit" name="submit" value="%s" />', __('Finish'));
+        wp_nonce_field('import-textpattern');
+        printf('<input type="submit" name="submit" value="%s" />', attribute_escape(__('Finish')));
         echo '</form>';
+    }
 …
         if ( $step > 0 )
+        {
+            check_admin_referer('import-textpattern');
             if($_POST['dbuser'])
+            {
                 if(get_option('txpuser'))
                     delete_option('txpuser');
                 add_option('txpuser',$_POST['dbuser']);
+                add_option('txpuser', sanitize_user($_POST['dbuser'], true));
+            }
             if($_POST['dbpass'])
 …
                 if(get_option('txppass'))
                     delete_option('txppass');
                 add_option('txppass',$_POST['dbpass']);
+                add_option('txppass',  sanitize_user($_POST['dbpass'], true));
+            }
 …
                 if(get_option('txpname'))
                     delete_option('txpname');
                 add_option('txpname',$_POST['dbname']);
+                add_option('txpname',  sanitize_user($_POST['dbname'], true));
+            }
             if($_POST['dbhost'])
 …
                 if(get_option('txphost'))
                     delete_option('txphost');
                 add_option('txphost',$_POST['dbhost']);
+                add_option('txphost',  sanitize_user($_POST['dbhost'], true));
+            }
             if($_POST['dbprefix'])
 …
                 if(get_option('tpre'))
                     delete_option('tpre');
                 add_option('tpre',$_POST['dbprefix']);
+                add_option('tpre',  sanitize_user($_POST['dbprefix']));
+            }

tags/2.2/wp-admin/import/wordpress.php

-                      r5468
+                      r5480
     var $posts = array ();
+    var $posts_processed = array ();
+    // Array of arrays. [[0] => XML fragment, [1] => New post ID]
     var $file;
     var $id;
 …
     function get_tag( $string, $tag ) {
+        global $wpdb;
         preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
         $return = addslashes( trim( $return[1] ) );
+        $return = $wpdb->escape( trim( $return[1] ) );
         return $return;
+    }
 …
             $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user
             if (!$user_id) { //banging my head against the desk now.
                 if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname
+                if ($this->newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname
                     $user_id = wp_create_user($author, $pass);
                     $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank.
 …
     function get_entries() {
         set_magic_quotes_runtime(0);
+        $importdata = file($this->file); // Read the file into an array
+        $importdata = implode('', $importdata); // squish it
+        $importdata = preg_replace("/(\r\n|\n|\r)/", "\n", $importdata);
+        preg_match_all('|<item>(.*?)</item>|is', $importdata, $this->posts);
+        $this->posts = $this->posts[1];
+        preg_match_all('|<wp:category>(.*?)</wp:category>|is', $importdata, $this->categories);
+        $this->categories = $this->categories[1];
+        $importdata = array_map('rtrim', file($this->file)); // Read the file into an array
+        $this->posts = array();
+        $this->categories = array();
+        $num = 0;
+        $doing_entry = false;
+        foreach ($importdata as $importline) {
+            if ( false !== strpos($importline, '<wp:category>') ) {
+                preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
+                $this->categories[] = $category[1];
+                continue;
+            }
+            if ( false !== strpos($importline, '<item>') ) {
+                $this->posts[$num] = '';
+                $doing_entry = true;
+                continue;
+            }
+            if ( false !== strpos($importline, '</item>') ) {
+                $num++;
+                $doing_entry = false;
+                continue;
+            }
+            if ( $doing_entry ) {
+                $this->posts[$num] .= $importline . "\n";
+            }
+        }
+        foreach ($this->posts as $post) {
+            $post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
+            if ($post_ID) {
+                $this->posts_processed[$post_ID][0] = &$post;
+                $this->posts_processed[$post_ID][1] = 0;
+            }
+        }
+    }
 …
         echo '<ol id="authors">';
         echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">';
+        wp_nonce_field('import-wordpress');
         $j = -1;
         foreach ($authors as $author) {
 …
         $file = wp_import_handle_upload();
         if ( isset($file['error']) ) {
-            $this->header();
             echo '<p>'.__('Sorry, there has been an error.').'</p>';
             echo '<p><strong>' . $file['error'] . '</strong></p>';
-            $this->footer();
             return;
+        }
 …
     function process_posts() {
-        global $wpdb;
         $i = -1;
         echo '<ol>';
+        foreach ($this->posts as $post) {
+            // There are only ever one of these
+            $post_title     = $this->get_tag( $post, 'title' );
+            $post_date      = $this->get_tag( $post, 'wp:post_date' );
+            $post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
+            $comment_status = $this->get_tag( $post, 'wp:comment_status' );
+            $ping_status    = $this->get_tag( $post, 'wp:ping_status' );
+            $post_status    = $this->get_tag( $post, 'wp:status' );
+            $post_parent    = $this->get_tag( $post, 'wp:post_parent' );
+            $post_type      = $this->get_tag( $post, 'wp:post_type' );
+            $guid           = $this->get_tag( $post, 'guid' );
+            $post_author    = $this->get_tag( $post, 'dc:creator' );
+            $post_content = $this->get_tag( $post, 'content:encoded' );
+            $post_content = str_replace(array ('<![CDATA[', ']]>'), '', $post_content);
+            $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+            $post_content = str_replace('<br>', '<br />', $post_content);
+            $post_content = str_replace('<hr>', '<hr />', $post_content);
+            preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
+            $categories = $categories[1];
+            $cat_index = 0;
+            foreach ($categories as $category) {
+                $categories[$cat_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $category)));
+                $cat_index++;
+            }
+            if ($post_id = post_exists($post_title, '', $post_date)) {
+                echo '<li>';
+                printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
+            } else {
+                echo '<li>';
+                printf(__('Importing post <i>%s</i>...'), stripslashes($post_title));
+                $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
+                $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'post_type');
+                $comment_post_ID = $post_id = wp_insert_post($postdata);
+                // Add categories.
+                if (0 != count($categories)) {
+                    wp_create_categories($categories, $post_id);
+        foreach ($this->posts as $post)
+            $this->process_post($post);
+        echo '</ol>';
+        wp_import_cleanup($this->id);
+        echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
+    }
+    function process_post($post) {
+        global $wpdb;
+        $post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
+        if ( $post_ID && !empty($this->posts_processed[$post_ID][1]) ) // Processed already
+            return 0;
+        // There are only ever one of these
+        $post_title     = $this->get_tag( $post, 'title' );
+        $post_date      = $this->get_tag( $post, 'wp:post_date' );
+        $post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
+        $comment_status = $this->get_tag( $post, 'wp:comment_status' );
+        $ping_status    = $this->get_tag( $post, 'wp:ping_status' );
+        $post_status    = $this->get_tag( $post, 'wp:status' );
+        $post_name      = $this->get_tag( $post, 'wp:post_name' );
+        $post_parent    = $this->get_tag( $post, 'wp:post_parent' );
+        $menu_order     = $this->get_tag( $post, 'wp:menu_order' );
+        $post_type      = $this->get_tag( $post, 'wp:post_type' );
+        $guid           = $this->get_tag( $post, 'guid' );
+        $post_author    = $this->get_tag( $post, 'dc:creator' );
+        $post_content = $this->get_tag( $post, 'content:encoded' );
+        $post_content = str_replace(array ('<![CDATA[', ']]>'), '', $post_content);
+        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
+        $post_content = str_replace('<br>', '<br />', $post_content);
+        $post_content = str_replace('<hr>', '<hr />', $post_content);
+        preg_match_all('|<category>(.*?)</category>|is', $post, $categories);
+        $categories = $categories[1];
+        $cat_index = 0;
+        foreach ($categories as $category) {
+            $categories[$cat_index] = $wpdb->escape($this->unhtmlentities(str_replace(array ('<![CDATA[', ']]>'), '', $category)));
+            $cat_index++;
+        }
+        if ($post_id = post_exists($post_title, '', $post_date)) {
+            echo '<li>';
+            printf(__('Post <i>%s</i> already exists.'), stripslashes($post_title));
+        } else {
+            // If it has parent, process parent first.
+            $post_parent = (int) $post_parent;
+            if ($parent = $this->posts_processed[$post_parent]) {
+                if (!$parent[1]) $this->process_post($parent[0]); // If not yet, process the parent first.
+                $post_parent = $parent[1]; // New ID of the parent;
+            }
+            echo '<li>';
+            printf(__('Importing post <i>%s</i>...'), stripslashes($post_title));
+            $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
+            $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'post_name', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'menu_order', 'post_type');
+            $comment_post_ID = $post_id = wp_insert_post($postdata);
+            // Memorize old and new ID.
+            if ( $post_id && $post_ID && $this->posts_processed[$post_ID] )
+                $this->posts_processed[$post_ID][1] = $post_id; // New ID.
+            // Add categories.
+            if (count($categories) > 0) {
+                $post_cats = array();
+                foreach ($categories as $category) {
+                    $cat_ID = (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name = '$category'");
+                    if ($cat_ID == 0) {
+                        $cat_ID = wp_insert_category(array('cat_name' => $category));
+                    }
+                    $post_cats[] = $cat_ID;
+                }
+            }
+                // Now for comments
+                preg_match_all('|<wp:comment>(.*?)</wp:comment>|is', $post, $comments);
+                $comments = $comments[1];
+                $num_comments = 0;
+                if ( $comments) { foreach ($comments as $comment) {
+                    $comment_author       = $this->get_tag( $comment, 'wp:comment_author');
+                    $comment_author_email = $this->get_tag( $comment, 'wp:comment_author_email');
+                    $comment_author_IP    = $this->get_tag( $comment, 'wp:comment_author_IP');
+                    $comment_author_url   = $this->get_tag( $comment, 'wp:comment_author_url');
+                    $comment_date         = $this->get_tag( $comment, 'wp:comment_date');
+                    $comment_date_gmt     = $this->get_tag( $comment, 'wp:comment_date_gmt');
+                    $comment_content      = $this->get_tag( $comment, 'wp:comment_content');
+                    $comment_approved     = $this->get_tag( $comment, 'wp:comment_approved');
+                    $comment_type         = $this->get_tag( $comment, 'wp:comment_type');
+                    $comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
+                    if ( !comment_exists($comment_author, $comment_date) ) {
+                        $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
+                        wp_insert_comment($commentdata);
+                        $num_comments++;
+                    }
+                } }
+                if ( $num_comments )
+                    printf(' '.__('(%s comments)'), $num_comments);
+                // Now for post meta
+                preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);
+                $postmeta = $postmeta[1];
+                if ( $postmeta) { foreach ($postmeta as $p) {
+                    $key   = $this->get_tag( $p, 'wp:meta_key' );
+                    $value = $this->get_tag( $p, 'wp:meta_value' );
+                    add_post_meta( $post_id, $key, $value );
+                } }
+            $index++;
+        }
+        echo '</ol>';
+        wp_import_cleanup($this->id);
+        echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
+                wp_set_post_categories($post_id, $post_cats);
+            }
+        }
+        // Now for comments
+        preg_match_all('|<wp:comment>(.*?)</wp:comment>|is', $post, $comments);
+        $comments = $comments[1];
+        $num_comments = 0;
+        if ( $comments) { foreach ($comments as $comment) {
+            $comment_author       = $this->get_tag( $comment, 'wp:comment_author');
+            $comment_author_email = $this->get_tag( $comment, 'wp:comment_author_email');
+            $comment_author_IP    = $this->get_tag( $comment, 'wp:comment_author_IP');
+            $comment_author_url   = $this->get_tag( $comment, 'wp:comment_author_url');
+            $comment_date         = $this->get_tag( $comment, 'wp:comment_date');
+            $comment_date_gmt     = $this->get_tag( $comment, 'wp:comment_date_gmt');
+            $comment_content      = $this->get_tag( $comment, 'wp:comment_content');
+            $comment_approved     = $this->get_tag( $comment, 'wp:comment_approved');
+            $comment_type         = $this->get_tag( $comment, 'wp:comment_type');
+            $comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
+            if ( !comment_exists($comment_author, $comment_date) ) {
+                $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
+                wp_insert_comment($commentdata);
+                $num_comments++;
+            }
+        } }
+        if ( $num_comments )
+            printf(' '.__('(%s comments)'), $num_comments);
+        // Now for post meta
+        preg_match_all('|<wp:postmeta>(.*?)</wp:postmeta>|is', $post, $postmeta);
+        $postmeta = $postmeta[1];
+        if ( $postmeta) { foreach ($postmeta as $p) {
+            $key   = $this->get_tag( $p, 'wp:meta_key' );
+            $value = $this->get_tag( $p, 'wp:meta_value' );
+            $value = stripslashes($value); // add_post_meta() will escape.
+            add_post_meta( $post_id, $key, $value );
+        } }
+    }
 …
                 break;
             case 1 :
+                check_admin_referer('import-upload');
                 $this->select_authors();
                 break;
             case 2:
+                check_admin_referer('import-wordpress');
                 $this->import();
                 break;

tags/2.2/wp-admin/index.php

-                      r5468
+                      r5480
 add_action( 'admin_head', 'index_js' );
 wp_enqueue_script('prototype');
+wp_enqueue_script('interface');
 $title = __('Dashboard');
 …
 if ( $comments ) {
 foreach ($comments as $comment) {
     echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>');
+    echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . apply_filters('the_title', get_the_title($comment->comment_post_ID)) . '</a>');
     edit_comment_link(__("Edit"), ' <small>(', ')</small>');
     echo '</li>';
 …
 <?php
 if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
+if ( $recentposts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql('post') . " AND post_date_gmt < '$today' ORDER BY post_date DESC LIMIT 5") ) :
 ?>
 <div>
 …
 <h3><?php _e('Blog Stats'); ?></h3>
 <?php
+$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
+if (0 < $numposts) $numposts = number_format($numposts);
+$numposts = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
+$numcomms = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
+$numcats  = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories");
+$numcomms = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
+if (0 < $numcomms) $numcomms = number_format($numcomms);
+$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format($numposts), 'edit.php');
+$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), number_format($numcomms), 'edit-comments.php');
+$cat_str  = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), number_format($numcats), 'categories.php');
+?>
+$numcats = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories");
+if (0 < $numcats) $numcats = number_format($numcats);
+?>
+<p><?php
+$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), $numposts, 'edit.php');
+$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), $numcomms, 'edit-comments.php');
+$cat_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), $numcats, 'categories.php');
+printf(__('There are currently %1$s and %2$s, contained within %3$s.'), $post_str, $comm_str, $cat_str); ?></p>
+<p><?php printf(__('There are currently %1$s and %2$s, contained within %3$s.'), $post_str, $comm_str, $cat_str); ?></p>
 </div>
 …
     <li><a href="profile.php"><?php _e('Update your profile or change your password'); ?></a></li>
 <?php if ( current_user_can('manage_links') ) : ?>
     <li><a href="link-add.php"><?php _e('Add a bookmark to your blogroll'); ?></a></li>
+    <li><a href="link-add.php"><?php _e('Add a link to your blogroll'); ?></a></li>
 <?php endif; ?>
 <?php if ( current_user_can('switch_themes') ) : ?>

tags/2.2/wp-admin/link-add.php

r5468	r5480
29	29	<div id="wp-link-bookmarklet" class="wrap">
30	30	<h3><?php _e('Add Link Bookmarklet'); ?></h3>
31		<p><?php _e('Right click on the following link and choose ~~"Bookmark This Link..." to create an add link shortcut. Right now this only works on Mozilla or Netscape, but we’re working on i~~t.'); ?></p>
	31	<p><?php _e('Right click on the following link and choose Bookmark This Link... or Add to Favorites... to create a Link This shortcut.'); ?></p>
32	32	<?php printf('<p><a href="%s" title="'.__('Link add bookmarklet').'">'.__('Link This').'</a></p>', "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
33	33	</div>

tags/2.2/wp-admin/link-import.php

-                      r5468
+                      r5480
 <?php
 switch ($step) {
+    case 0:
+    {
+        include_once('admin-header.php');
+        if ( !current_user_can('manage_links') )
+            wp_die(__('Cheatin&#8217; uh?'));
+    case 0: {
+        include_once('admin-header.php');
+        if ( !current_user_can('manage_links') )
+            wp_die(__('Cheatin&#8217; uh?'));
         $opmltype = 'blogrolling'; // default.
+        $opmltype = 'blogrolling'; // default.
 ?>
 <div class="wrap">
 <h2><?php _e('Import your blogroll from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
 …
 </div>
 </div>
 …
 foreach ($categories as $category) {
 ?>
 <option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars($category->cat_name); ?></option>
+<option value="<?php echo $category->cat_ID; ?>"><?php echo wp_specialchars(apply_filters('link_category', $category->cat_name)); ?></option>
 <?php
 } // end foreach
 …
 </div>
 <?php
                 break;
             } // end case 0
+        break;
+    } // end case 0
     case 1: {
+    case 1: {
         check_admin_referer('import-bookmarks');
                 include_once('admin-header.php');
                 if ( !current_user_can('manage_links') )
                     wp_die(__('Cheatin&#8217; uh?'));
+        include_once('admin-header.php');
+        if ( !current_user_can('manage_links') )
+            wp_die(__('Cheatin&#8217; uh?'));
 ?>
 <div class="wrap">
      <h2><?php _e('Importing...') ?></h2>
+<h2><?php _e('Importing...') ?></h2>
 <?php
+                $cat_id = $_POST['cat_id'];
+                if (($cat_id == '') || ($cat_id == 0)) {
+                    $cat_id  = 1;
+                }
+        $cat_id = $_POST['cat_id'];
+        if ( $cat_id == '' || $cat_id == 0 )
+            $cat_id  = 1;
+                $opml_url = $_POST['opml_url'];
+                if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
+                    $blogrolling = true;
+                }
+                else // try to get the upload file.
+                {
+                    $overrides = array('test_form' => false, 'test_type' => false);
+                    $file = wp_handle_upload($_FILES['userfile'], $overrides);
+        $opml_url = $_POST['opml_url'];
+        if ( isset($opml_url) && $opml_url != '' && $opml_url != 'http://' ) {
+            $blogrolling = true;
+        } else { // try to get the upload file.
+            $overrides = array('test_form' => false, 'test_type' => false);
+            $file = wp_handle_upload($_FILES['userfile'], $overrides);
                     if ( isset($file['error']) )
                         wp_die($file['error']);
+            if ( isset($file['error']) )
+                wp_die($file['error']);
                     $url = $file['url'];
                     $opml_url = $file['file'];
                     $blogrolling = false;
+                }
+            $url = $file['url'];
+            $opml_url = $file['file'];
+            $blogrolling = false;
+        }
+                if (isset($opml_url) && $opml_url != '') {
+                    $opml = wp_remote_fopen($opml_url);
+                    include_once('link-parse-opml.php');
+        if ( isset($opml_url) && $opml_url != '' ) {
+            if ( $blogrolling === true ) {
+                $opml = wp_remote_fopen($opml_url);
+            } else {
+                $opml = file_get_contents($opml_url);
+            }
+            include_once('link-parse-opml.php');
                     $link_count = count($names);
                     for ($i = 0; $i < $link_count; $i++) {
                         if ('Last' == substr($titles[$i], 0, 4))
                             $titles[$i] = '';
                         if ('http' == substr($titles[$i], 0, 4))
                             $titles[$i] = '';
+                        $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
                         wp_insert_link($link);
                         echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+                    }
+            $link_count = count($names);
+            for ( $i = 0; $i < $link_count; $i++ ) {
+                if ('Last' == substr($titles[$i], 0, 4))
+                    $titles[$i] = '';
+                if ( 'http' == substr($titles[$i], 0, 4) )
+                    $titles[$i] = '';
+                $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                wp_insert_link($link);
+                echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+            }
 ?>
+     <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+<p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
 <?php
                 } // end if got url
                 else
+                {
                     echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
                 } // end else
+} // end if got url
+else
+{
+    echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
+} // end else
+                if ( ! $blogrolling )
+                    @unlink($opml_url);
+if ( ! $blogrolling )
+    apply_filters( 'wp_delete_file', $opml_url);
+    @unlink($opml_url);
 ?>
 </div>
 <?php
                 break;
             } // end case 1
+        break;
+    } // end case 1
 } // end switch

tags/2.2/wp-admin/link-manager.php

-                      r5468
+                      r5480
 $select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('All') . "</option>\n";
 foreach ((array) $categories as $cat)
     $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars($cat->cat_name) . "</option>\n";
+    $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars(apply_filters('link_category', $cat->cat_name)) . "</option>\n";
 $select_cat .= "</select>\n";
 …
 <?php
     foreach ($links as $link) {
         $link->link_name = attribute_escape($link->link_name);
         $link->link_description = wp_specialchars($link->link_description);
+        $link->link_name = attribute_escape(apply_filters('link_title', $link->link_name));
+        $link->link_description = wp_specialchars(apply_filters('link_description', $link->link_description));
         $link->link_url = clean_url($link->link_url);
         $link->link_category = wp_get_link_cats($link->link_id);
 …
                     foreach ($link->link_category as $category) {
                         $cat_name = get_the_category_by_ID($category);
                         $cat_name = wp_specialchars($cat_name);
+                        $cat_name = wp_specialchars(apply_filters('link_category', $cat_name));
                         if ( $cat_id != $category )
                             $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
 …
                 default:
                     ?>
                     <td><?php do_action('manage_link_custom_column', $column_name, $id); ?></td>
+                    <td><?php do_action('manage_link_custom_column', $column_name, $link->link_id); ?></td>
                     <?php
                     break;

tags/2.2/wp-admin/menu.php

-                      r5468
+                      r5480
 $menu[0] = array(__('Dashboard'), 'read', 'index.php');
 if ( strstr($_SERVER['REQUEST_URI'], 'edit-pages.php') )
+if (strpos($_SERVER['REQUEST_URI'], 'edit-pages.php') !== false)
     $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
 else
     $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
 if ( strstr($_SERVER['REQUEST_URI'], 'page-new.php') )
+if (strpos($_SERVER['REQUEST_URI'], 'page-new.php') !== false)
     $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
 else
     $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
 $menu[15] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
 $menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
 …
 $submenu['themes.php'][10] = array(__('Theme Editor'), 'edit_themes', 'theme-editor.php');
+do_action('_admin_menu');
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
 …
         $_wp_real_parent_file[$old_parent] = $new_parent;
         $menu[$id][2] = $new_parent;
         foreach ($submenu[$old_parent] as $index => $data) {
             $submenu[$new_parent][$index] = $submenu[$old_parent][$index];

tags/2.2/wp-admin/moderation.php

r5468	r5480
122	122	<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>\| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> \| <?php comment_author_url_link() ?> <?php } ?>\| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
123	123	<?php comment_text() ?>
124		<p><?php comment_date(~~'M j, g:i A'~~); ?> — [ <?php
	124	<p><?php comment_date(__('M j, g:i A')); ?> — [ <?php
125	125	echo '<a href="comment.php?action=editcomment&c='.$comment->comment_ID.'">' . __('Edit') . '</a> \| ';
126	126	echo " <a href=\"post.php?action=deletecomment&p=".$comment->comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author )) . "', theCommentList );\">" . __('Delete') . "</a> \| "; ?>

tags/2.2/wp-admin/options-general.php

-                      r5468
+                      r5480
 <tr valign="top">
 <th scope="row"><?php _e('WordPress address (URL):') ?></th>
 <td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td>
+<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Blog address (URL):') ?></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
+<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /><br /><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></td>
 </tr>
 <tr valign="top">
 …
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="blogname,blogdescription,siteurl,admin_email,users_can_register,gmt_offset,date_format,time_format,home,start_of_week,comment_registration,default_role" />
+<input type="hidden" name="page_options" value="<?php if ( ! defined( 'WP_SITEURL' ) ) echo 'siteurl,'; if ( ! defined( 'WP_HOME' ) ) echo 'home,'; ?>blogname,blogdescription,admin_email,users_can_register,gmt_offset,date_format,time_format,start_of_week,comment_registration,default_role" />
 </p>
 </form>

tags/2.2/wp-admin/options-head.php

r5468	r5480
1	1	<?php wp_reset_vars(array('action', 'standalone', 'option_group_id')); ?>
2
3		~~<br clear="all" />~~
4	2
5	3	<?php if (isset($_GET['updated'])) : ?>

tags/2.2/wp-admin/options-misc.php

r5468	r5480
37	37
38	38	<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
39		<label for="use_linksupdate"><?php _e('Track ~~Bookmar~~ks’ Update Times') ?></label></p>
	39	<label for="use_linksupdate"><?php _e('Track Links’ Update Times') ?></label></p>
40	40	<p>
41	41	<label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_option('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>

tags/2.2/wp-admin/options-writing.php

-                      r5468
+                      r5480
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Default bookmark category:') ?></th>
+<th scope="row"><?php _e('Default link category:') ?></th>
 <td><select name="default_link_category" id="default_link_category">
 <?php
 …
 <?php else : ?>
     <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog\'s <a href="%s">privacy settings</a>'), 'options-privacy.php'); ?>
+    <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your blog\'s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?>
 <?php endif; ?>

tags/2.2/wp-admin/options.php

-                      r5468
+                      r5480
+    }
     return $value;
+    return $value;
+}
 …
 <td>";
     if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
+    if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
     else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />";
     echo "</td>
     <td>$option->option_description</td>

tags/2.2/wp-admin/page-new.php

r5468	r5480
5	5	$editing = true;
6	6	wp_enqueue_script('prototype');
	7	wp_enqueue_script('interface');
7	8	wp_enqueue_script('autosave');
8	9	require_once('admin-header.php');

tags/2.2/wp-admin/page.php

-                      r5468
+                      r5480
     if($post->post_status == 'draft') {
         wp_enqueue_script('prototype');
+        wp_enqueue_script('interface');
         wp_enqueue_script('autosave');
+    }
 …
     include('edit-page-form.php');
-    ?>
-    <div id='preview' class='wrap'>
-    <h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?></h2>
-        <iframe src="<?php echo clean_url(apply_filters('preview_page_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe>
-    </div>
-    <?php
     break;
 …
         if ( isset($_POST['save']) )
             $location = "page.php?action=edit&post=$page_ID";
+            $location = "page.php?action=edit&post=$page_ID";
     } else {
         if ($_POST['save']) {
 …
     $sendback = wp_get_referer();
     if (strstr($sendback, 'page.php')) $sendback = get_option('siteurl') .'/wp-admin/page.php';
     elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+    if (strpos($sendback, 'page.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/page.php';
+    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
     $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
     wp_redirect($sendback);

tags/2.2/wp-admin/plugin-editor.php

-                      r5468
+                      r5480
         fwrite($f, $newcontent);
         fclose($f);
+        // Deactivate so we can test it.
+        $current = get_option('active_plugins');
+        if ( in_array($file, $current) || isset($_POST['phperror']) ) {
+            if ( in_array($file, $current) ) {
+                array_splice($current, array_search( $file, $current), 1 ); // Array-fu!
+                update_option('active_plugins', $current);
+            }
+            wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1"));
+            exit();
+        }
         wp_redirect("plugin-editor.php?file=$file&a=te");
     } else {
 …
     if ( !current_user_can('edit_plugins') )
         wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
+    if ( $_GET['liveupdate'] ) {
+        check_admin_referer('edit-plugin-test_' . $file);
+        $current = get_option('active_plugins');
+        $plugin = $file;
+        if ( validate_file($plugin) )
+            wp_die(__('Invalid plugin.'));
+        if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
+            wp_die(__('Plugin file does not exist.'));
+        if (!in_array($plugin, $current)) {
+            wp_redirect("plugin-editor.php?file=$file&phperror=1"); // we'll override this later if the plugin can be included without fatal error
+            @include(ABSPATH . PLUGINDIR . '/' . $plugin);
+            $current[] = $plugin;
+            sort($current);
+            update_option('active_plugins', $current);
+        }
+        wp_redirect("plugin-editor.php?file=$file&a=te");
+    }
     require_once('admin-header.php');
 …
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
+<?php elseif (isset($_GET['phperror'])) : ?>
+ <div id="message" class="updated fade"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p></div>
 <?php endif; ?>
  <div class="wrap">
     <?php
+    if (is_writeable($real_file)) {
+        echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
+    if ( in_array($file, (array) get_option('active_plugins')) ) {
+        if (is_writeable($real_file)) {
+            echo '<h2>' . sprintf(__('Editing <strong>%s</strong> (active)'), $file) . '</h2>';
+        } else {
+        echo '<h2>' . sprintf(__('Browsing <strong>%s</strong> (active)'), $file) . '</h2>';
+        }
     } else {
+        echo '<h2>' . sprintf(__('Browsing <strong>%s</strong>'), $file) . '</h2>';
+        if (is_writeable($real_file)) {
+            echo '<h2>' . sprintf(__('Editing <strong>%s</strong> (inactive)'), $file) . '</h2>';
+        } else {
+        echo '<h2>' . sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file) . '</h2>';
+        }
+    }
     ?>
 …
         </div>
 <?php if ( is_writeable($real_file) ) : ?>
+    <?php if ( in_array($file, (array) get_option('active_plugins')) ) { ?>
+        <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
+    <?php } ?>
     <p class="submit">
     <?php
+        echo "<input type='submit' name='submit' value='    " . __('Update File &raquo;') . "' tabindex='2' />";
+        if ( isset($_GET['phperror']) )
+            echo "<input type='hidden' name='phperror' value='1' /><input type='submit' name='submit' value='" . __('Update File and Attempt to Reactivate &raquo;') . "' tabindex='2' />";
+        else
+            echo "<input type='submit' name='submit' value='" . __('Update File &raquo;') . "' tabindex='2' />";
     ?>
     </p>

tags/2.2/wp-admin/plugins.php

-                      r5468
+                      r5480
             wp_die(__('Plugin file does not exist.'));
         if (!in_array($plugin, $current)) {
+            wp_redirect('plugins.php?error=true'); // we'll override this later if the plugin can be included without fatal error
+            ob_start();
+            @include(ABSPATH . PLUGINDIR . '/' . $plugin);
             $current[] = $plugin;
             sort($current);
             update_option('active_plugins', $current);
-            include(ABSPATH . PLUGINDIR . '/' . $plugin);
             do_action('activate_' . $plugin);
+            ob_end_clean();
+        }
         wp_redirect('plugins.php?activate=true');
+        wp_redirect('plugins.php?activate=true'); // overrides the ?error=true one above
     } else if ('deactivate' == $_GET['action']) {
         check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
 …
         do_action('deactivate_' . trim( $_GET['plugin'] ));
         wp_redirect('plugins.php?deactivate=true');
+    } elseif ($_GET['action'] == 'deactivate-all') {
+        check_admin_referer('deactivate-all');
+        $current = get_option('active_plugins');
+        foreach ($current as $plugin) {
+            array_splice($current, array_search($plugin, $current), 1);
+            do_action('deactivate_' . $plugin);
+        }
+        update_option('active_plugins', array());
+        wp_redirect('plugins.php?deactivate-all=true');
+    }
     exit;
 …
 ?>
+<?php if (isset($_GET['activate'])) : ?>
+<div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p>
+</div>
+<?php endif; ?>
+<?php if (isset($_GET['deactivate'])) : ?>
+<div id="message" class="updated fade"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p>
+</div>
+<?php if ( isset($_GET['error']) ) : ?>
+    <div id="message" class="updated fade"><p><?php _e('Plugin could not be activated because it triggered a <strong>fatal error</strong>.') ?></p></div>
+<?php elseif ( isset($_GET['activate']) ) : ?>
+    <div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
+<?php elseif ( isset($_GET['deactivate']) ) : ?>
+    <div id="message" class="updated fade"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div>
+<?php elseif (isset($_GET['deactivate-all'])) : ?>
+    <div id="message" class="updated fade"><p><?php _e('All plugins <strong>deactivated</strong>.'); ?></p></div>
 <?php endif; ?>
 …
         if ( $style != '' )
             $style = 'class="' . $style . '"';
         if ( is_writable(ABSPATH . 'wp-content/plugins/' . $plugin_file) )
+        if ( is_writable(ABSPATH . PLUGINDIR . '/' . $plugin_file) )
             $edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
         else
 …
 ?>
+<tr>
+    <td colspan="3">&nbsp;</td>
+    <td colspan="2" style="width:12em;"><a href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>" class="delete"><?php _e('Deactivate All Plugins'); ?></a></td>
+</tr>
 </table>
 <?php

tags/2.2/wp-admin/post-new.php

r5468	r5480
5	5	$editing = true;
6	6	wp_enqueue_script('prototype');
	7	wp_enqueue_script('interface');
7	8	wp_enqueue_script('autosave');
8	9	require_once ('./admin-header.php');

tags/2.2/wp-admin/post.php

-                      r5468
+                      r5480
     $post_ID = $p = (int) $_GET['post'];
     $post = get_post($post_ID);
     if ( 'page' == $post->post_type ) {
         wp_redirect("page.php?action=edit&post=$post_ID");
 …
     include('edit-form-advanced.php');
-    ?>
-    <div id='preview' class='wrap'>
-    <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?></h2>
-        <iframe src="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe>
-    </div>
-    <?php
     break;
 …
             $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
         $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
         if ($_POST['save']) {
             $location = "post.php?action=edit&post=$post_ID";
 …
     $sendback = wp_get_referer();
     if (strstr($sendback, 'post.php')) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
     elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+    if (strpos($sendback, 'post.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
+    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
     $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
     wp_redirect($sendback);

tags/2.2/wp-admin/rtl.css

-                      r5468
+                      r5480
 #wphead h1 { font-size: 2.4em; }
 #postdiv , #titlediv, #guiddiv { margin: 0 0 0 8px; }
+#postdiv, #titlediv, #guiddiv, #tagdiv { margin: 0 0 0 8px; }
 #ed_toolbar input { margin: 3px 0 2px 2px; }
 …
 #adminmenu {
     padding: .2em 2em .3em .2em;
+    height: 30px;
+}
+    height: 28px;
+}
+#adminmenu li { line-height: 160%; }
 #adminmenu a {
 …
+}
+#adminmenu li { line-height: 180%; }
+#submenu, #minisub { padding: 3px 3em 0 2em; }
+#submenu, #minisub { padding: 1px 3em 0 2em; }
+#submenu { height: 28px; }
+#submenu li { line-height: 160%; }
+#submenu a {
+    margin: 0 0 0 10px;
+    display: block;
+    float: right;
+}
 #submenu .current {
 …
+}
-#submenu a {
-    padding: .3em .4em .4em .4em;
-    margin: 0 0 0 10px;
-    display: block;
-    float: right;
+}
-#submenu li { line-height: 120%; }
 #currenttheme img {
     float: right;
 …
+}
+* html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open, #postexcerpt div, #attachmentlinks div {
+#postexcerpt div, #attachmentlinks div {
+    margin-right: auto;
+    margin-left: 8px;
+}
+* html #postexcerpt .dbx-toggle-open {
     padding-right: 0;
     padding-left: 8px;
 …
     margin-left: 3px;
+}
+a.view-link {
+    right:auto;
+    left:5%;
+    margin-right:0;
+    margin-left:220px;
+}

tags/2.2/wp-admin/setup-config.php

-                      r5468
+                      r5480
         switch (substr($line,0,16)) {
             case "define('DB_NAME'":
                 fwrite($handle, str_replace("wordpress", $dbname, $line));
+                fwrite($handle, str_replace("putyourdbnamehere", $dbname, $line));
                 break;
             case "define('DB_USER'":
                 fwrite($handle, str_replace("'username'", "'$uname'", $line));
+                fwrite($handle, str_replace("'usernamehere'", "'$uname'", $line));
                 break;
             case "define('DB_PASSW":
                 fwrite($handle, str_replace("'password'", "'$passwrd'", $line));
+                fwrite($handle, str_replace("'yourpasswordhere'", "'$passwrd'", $line));
                 break;
             case "define('DB_HOST'":

tags/2.2/wp-admin/templates.php

r5468	r5480
53	53	wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
54	54
55		if ( ~~strstr( $file, 'wp-config.php' )~~ )
	55	if (strpos($file, 'wp-config.php') !== false)
56	56	wp_die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
57	57

tags/2.2/wp-admin/themes.php

r5468	r5480
27	27	<div id="message1" class="updated fade"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
28	28	<?php elseif ( isset($_GET['activated']) ) : ?>
29		<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site »</a>'), get_bloginfo('~~home~~') . '/'); ?></p></div>
	29	<div id="message2" class="updated fade"><p><?php printf(__('New theme activated. <a href="%s">View site »</a>'), get_bloginfo('url') . '/'); ?></p></div>
30	30	<?php endif; ?>
31	31

tags/2.2/wp-admin/upgrade-functions.php

-                      r5468
+                      r5480
     update_option('blog_public', $public);
     $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+    if ( defined('WP_SITEURL') && '' != WP_SITEURL )
+        $guessurl = WP_SITEURL;
+    else
+        $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     update_option('siteurl', $guessurl);
 …
         upgrade_130();
+    }
+    maybe_disable_automattic_widgets();
     if ( $wp_current_db_version < 3308 )
 …
 function __get_option($setting) {
     global $wpdb;
+    if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+        return preg_replace( '|/+$|', '', constant( 'WP_HOME' ) );
+    }
+    if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+        return preg_replace( '|/+$|', '', constant( 'WP_SITEURL' ) );
+    }
     $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
 …
         if ($oldfile == 'index.php') { // Check to make sure it's not a new index
             $index = implode('', file("$oldpath/$oldfile"));
             if ( strstr( $index, 'WP_USE_THEMES' ) ) {
+            if (strpos($index, 'WP_USE_THEMES') !== false) {
                 if (! @copy(ABSPATH . 'wp-content/themes/default/index.php', "$site_dir/$newfile"))
                     return false;
 …
         foreach ($stylelines as $line) {
             if (strstr($line, "Theme Name:")) $line = "Theme Name: $theme_name";
             elseif (strstr($line, "Theme URI:")) $line = "Theme URI: " . __get_option('siteurl');
             elseif (strstr($line, "Description:")) $line = "Description: Your theme";
             elseif (strstr($line, "Version:")) $line = "Version: 1";
             elseif (strstr($line, "Author:")) $line = "Author: You";
             fwrite($f, "{$line}\n");
+            if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
+            elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+            elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
+            elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
+            elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+            fwrite($f, $line . "\n");
+        }
         fclose($f);
 …
+}
+function maybe_disable_automattic_widgets() {
+    $plugins = __get_option( 'active_plugins' );
+    foreach ( (array) $plugins as $plugin ) {
+        if ( basename( $plugin ) == 'widgets.php' ) {
+            array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
+            update_option( 'active_plugins', $plugins );
+            break;
+        }
+    }
+}
 ?>

tags/2.2/wp-admin/upgrade-schema.php

-                      r5468
+                      r5480
 <?php
 // Here we keep the DB structure and option values
+$charset_collate = '';
+if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+    if ( ! empty($wpdb->charset) )
+        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+    if ( ! empty($wpdb->collate) )
+        $charset_collate .= " COLLATE $wpdb->collate";
+}
 $wp_queries="CREATE TABLE $wpdb->categories (
 …
   PRIMARY KEY  (cat_ID),
   KEY category_nicename (category_nicename)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->comments (
   comment_ID bigint(20) unsigned NOT NULL auto_increment,
 …
   KEY comment_approved (comment_approved),
   KEY comment_post_ID (comment_post_ID)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->link2cat (
   rel_id bigint(20) NOT NULL auto_increment,
 …
   PRIMARY KEY  (rel_id),
   KEY link_id (link_id,category_id)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->links (
   link_id bigint(20) NOT NULL auto_increment,
 …
   KEY link_category (link_category),
   KEY link_visible (link_visible)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->options (
   option_id bigint(20) NOT NULL auto_increment,
 …
   PRIMARY KEY  (option_id,blog_id,option_name),
   KEY option_name (option_name)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->post2cat (
   rel_id bigint(20) NOT NULL auto_increment,
 …
   PRIMARY KEY  (rel_id),
   KEY post_id (post_id,category_id)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->postmeta (
   meta_id bigint(20) NOT NULL auto_increment,
 …
   KEY post_id (post_id),
   KEY meta_key (meta_key)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->posts (
   ID bigint(20) unsigned NOT NULL auto_increment,
 …
   KEY post_name (post_name),
   KEY type_status_date (post_type,post_status,post_date,ID)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->users (
   ID bigint(20) unsigned NOT NULL auto_increment,
 …
   PRIMARY KEY  (ID),
   KEY user_login_key (user_login)
 );
+) $charset_collate;
 CREATE TABLE $wpdb->usermeta (
   umeta_id bigint(20) NOT NULL auto_increment,
 …
   KEY user_id (user_id),
   KEY meta_key (meta_key)
 );";
+) $charset_collate;";
 function populate_options() {

tags/2.2/wp-admin/upgrade.php

-                      r5468
+                      r5480
 if (isset($_GET['step']))
     $step = $_GET['step'];
+    $step = (int) $_GET['step'];
 else
     $step = 0;
 …
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
+<?php
+switch($step) {
+<?php if ( get_option('db_version') == $wp_db_version ) : ?>
+<h2><?php _e('No Upgrade Required'); ?></h2>
+<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
+<h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue &raquo;'); ?></a></h2>
+<?php else :
+switch($step) :
     case 0:
         $goback = clean_url(stripslashes(wp_get_referer()));
+?>
+<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p>
+?>
+<h2><?php _e('Database Upgrade Required'); ?></h2>
+<p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p>
+<p><?php _e('The upgrade process may take a while, so please be patient.'); ?></p>
 <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
 <?php
 …
         if ( empty( $_GET['backto'] ) )
             $backto = __get_option('home');
+            $backto = __get_option('home') . '/';
         else
             $backto = clean_url(stripslashes($_GET['backto']));
 ?>
+<h2><?php _e('Step 1'); ?></h2>
+    <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"),  $backto); ?></p>
+<h2><?php _e('Upgrade Complete'); ?></h2>
+    <p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p>
+    <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue &raquo;'); ?></a></h2>
 <!--
 …
 <?php
         break;
+}
+endswitch;
+endif;
 ?>
 </body>

tags/2.2/wp-admin/upload-functions.php

-                      r5468
+                      r5480
     if ( isset($attachment_data['width']) )
         list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128);
     ob_start();
         the_title();
         $post_title = attribute_escape(ob_get_contents());
     ob_end_clean();
     $post_content = apply_filters( 'content_edit_pre', $post->post_content );
+    $post_content = attribute_escape(apply_filters( 'content_edit_pre', $post->post_content ));
     $class = 'text';
     $innerHTML = get_attachment_innerHTML( $id, false, $dims );
 …
     if ( $href )
         $r .= "<a id='file-link-$id' href='" . clean_url($href) ."' title='$post_title' class='file-link $class'>\n";
+        $r .= "<a id='file-link-$id' href='$href' title='$post_title' class='file-link $class'>\n";
     if ( $href || $image_src )
         $r .= "\t\t\t$innerHTML";
 …
     global $wpdb, $action, $paged;
     $old_vars = compact( 'paged' );
     switch ( $action ) :
     case 'edit' :
 …
+    }
+}
+?>

tags/2.2/wp-admin/upload.css

r5468	r5480
45	45
46	46	#upload-menu li #current-tab-nav {
	47	background: #f9fcfe;
47	48	float: left;
48	49	padding: 5px 5px 0 0;

tags/2.2/wp-admin/upload.php

r5468	r5480
90	90	$href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '', 'paged' => '') );
91	91	if ( isset($tab_array[4]) && is_array($tab_array[4]) )
92		add_query_arg( $tab_array[4], $href );
	92	$href = add_query_arg( $tab_array[4], $href );
93	93	$_href = clean_url( $href);
94	94	$page_links = '';

tags/2.2/wp-admin/user-edit.php

-                      r5468
+                      r5480
     <p><strong><?php _e('User updated.') ?></strong></p>
     <?php if ( $wp_http_referer ) : ?>
     <p><a href="<?php echo clean_url($wp_http_referer); ?>"><?php _e('&laquo; Back to Authors and Users'); ?></a></p>
+    <p><a href="users.php"><?php _e('&laquo; Back to Authors and Users'); ?></a></p>
     <?php endif; ?>
 </div>
 …
 <input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
 </p>
+<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', $profileuser->rich_editing); ?> /> <?php _e('Use the visual editor when writing'); ?></label></p>
+<p class="submit"><input type="submit" value="<?php _e('Update User &raquo;'); ?>" name="submit" /></p>
 <fieldset>

tags/2.2/wp-admin/users.php

-                      r5468
+                      r5480
                 'total' => ceil($this->total_users_for_query / $this->users_per_page),
                 'current' => $this->page,
                 'prev_text' => '&laquo; Previous Page',
                 'next_text' => 'Next Page &raquo;',
+                'prev_text' => __('&laquo; Previous Page'),
+                'next_text' => __('Next Page &raquo;'),
                 'base' => 'users.php?%_%',
                 'format' => 'userspage=%#%',
 …
     <form action="" method="get" name="search" id="search">
         <p><input type="text" name="usersearch" id="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" /> <input type="submit" value="<?php _e('Search   users &raquo;'); ?>" class="button" /></p>
+        <p><input type="text" name="usersearch" id="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" /> <input type="submit" value="<?php _e('Search Users &raquo;'); ?>" class="button" /></p>
     </form>
 …
 <div class="narrow">
+<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
+<?php
+    if ( get_option('users_can_register') )
+        echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '</p>';
+    else
+        echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '</p>';
+?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser">
 <?php wp_nonce_field('add-user') ?>

tags/2.2/wp-admin/wp-admin.css

-                      r5468
+                      r5480
     border: 1px solid #b2b2b2;
     color: #000;
     font:  13px Verdana, Arial, Helvetica, sans-serif;
+    font: 13px Verdana, Arial, Helvetica, sans-serif;
     margin: 1px;
     padding: 3px;
 …
 #uploading {
     border-style: none;
     padding: 0px;
+    padding: 0;
     margin-bottom: 16px;
     height: 18em;
 …
+}
+.commentlist li li {
+    border-bottom: 0px;
+    padding: 0;
+}
 .commentlist p {
     padding: 0;
 …
+}
 #adminmenu .current, #submenu .current {
     font-weight: bold;
 …
     list-style: none;
     text-align: center;
+    white-space: nowrap;
+}
 …
+}
 #categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input {
     border: none;
 …
 #postdiv, #titlediv, #guiddiv {
     margin: 0 8px 0 0;
     padding: 0px;
+    padding: 0;
+}
 #postdivrich {
     margin: 0px;
     padding: 0px;
+    margin: 0;
+    padding: 0;
+}
 #content {
     margin: 0 0 0 0;
+    margin: 0;
     width: 100%;
+}
 #postdivrich #content {
     padding: .7em;
+    padding: 5px;
     line-height: 140%;
+}
 #titlediv input, #guiddiv input {
     margin: 0px;
+    margin: 0;
     width: 100%;
+}
 …
 #postdivrich #quicktags {
     background: #f0f0ee;
     padding: 0px;
+    padding: 0;
     border: 1px solid #ccc;
     border-bottom: none;
 …
 #quicktags #ed_toolbar {
     padding: 0px 2px;
+    padding: 0 2px;
+}
 #ed_toolbar input {
     background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
+    background: #fff url( images/fade-butt.png ) repeat-x 0 -2px;
     margin: 3px 2px 2px;
+}
 …
 #title {
     font-size: 1.7em;
     padding: 4px;
+    padding: 4px 3px;
+}
 …
 #excerpt, .attachmentlinks {
     margin: 0px;
+    margin: 0;
     height: 4em;
     width: 100%;
 …
     display: block;
     border-bottom: none;
+}
+#login .hide {
+    display: none;
+    text-indent: -9999px;
+}
 …
 #postcustom table {
     border: 1px solid #ccc;
     margin: 0px;
+    margin: 0;
     width: 100%;
+}
 …
 * html #template div {
     margin-right: 0px;
+    margin-right: 0;
+}
 …
     letter-spacing: -.05em;
     margin: 0;
     font-family: Georgia, "Times New Roman", Times, serif
+    font-family: Georgia, "Times New Roman", Times, serif;
+}
 …
 set display:none; */
 .zerosize {
     height: 0px;
     width: 0px;
     margin: 0px;
     border: 0px;
     padding: 0px;
+    height: 0;
+    width: 0;
+    margin: 0;
+    border: 0;
+    padding: 0;
     overflow: hidden;
     position: absolute;
 …
 /* Box stuff */
 .dbx-clone {
     position:absolute;
     visibility:hidden;
+    position: absolute;
+    visibility: hidden;
+<

Context Navigation

Changes from tags/2.1.3 at r5468 to tags/2.2 at r5480

Legend: