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;
+}
 .dbx-clone, .dbx-clone .dbx-handle-cursor {
     cursor:move !important;
+    cursor: move !important;
+}
 .dbx-dummy {
     display:block;
     width:0;
     height:0;
     overflow:hidden;
+    display: block;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+}
 .dbx-group, .dbx-box, .dbx-handle {
     position:relative;
     display:block;
+    position: relative;
+    display: block;
+}
 …
 * html #themeselect {
     padding: 0px 3px;
+    padding: 0 3px;
     height: 22px;
+}
 …
 *****************************************************************/
 .dbx-box {
     margin:0;
     padding:0;
     border:none;
+    margin: 0;
+    padding: 0;
+    border: none;
+}
 …
+}
 #moremeta fieldset div {
     margin: 2px 0 0 0px;
+    margin: 2px 0 0 0;
     padding: 7px;
+}
 …
+}
 #your-profile fieldset input  {
+#your-profile fieldset input {
     width: 100%;
     font-size: 20px;
 …
 /* handles */
 .dbx-handle  {
+.dbx-handle {
     background: #2685af;
     padding: 6px 1em 2px;
 …
     margin-left: 8px;
     background: url(images/box-bg-right.gif) repeat-y right;
     padding: 10px 10px 15px 0px;
+    padding: 10px 10px 15px 0;
+}
 …
+}
 /* handle cursors */
 .dbx-handle-cursor {
 …
 /* toggle images */
 a.dbx-toggle, a.dbx-toggle:visited {
     display:block;
+    display: block;
     overflow: hidden;
     background-image: url( images/toggle.gif );
     position: absolute;
     top: 0px;
     right: 0px;
+    top: 0;
+    right: 0;
     background-repeat: no-repeat;
     border: 0px;
     margin: 0px;
     padding: 0px;
+    border: 0;
+    margin: 0;
+    padding: 0;
+}
 …
     height: 25px;
     width: 27px;
     background-position: 0 0px;
+    background-position: 0 0;
+}
 …
 #edButtons input, #edButtons input:active {
     margin: 0px 2px -1px;
+    margin: 0 2px -1px;
+}
 …
 #edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
     background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
+    background: #fff url( images/fade-butt.png ) repeat-x 0 15px;
     border-bottom: 1px solid #ccc;
+}
 …
     margin: 0 6px;
+}
+a.view-link {
+    position: absolute;
+    right: 5%;
+    margin-right: 220px;
+    text-decoration:underline;
+}

tags/2.2/wp-atom.php

-                      r5468
+                      r5480
+}
+header('Content-type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+$more = 1;
+require (ABSPATH . WPINC . '/feed-atom.php');
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<feed version="0.3"
-    xmlns="http://purl.org/atom/ns#"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xml:lang="<?php echo get_option('rss_language'); ?>"
-    <?php do_action('atom_ns'); ?>
+>
-    <title><?php bloginfo_rss('name') ?></title>
-    <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
-    <tagline><?php bloginfo_rss("description") ?></tagline>
-    <modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></modified>
-    <copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog'), 0); ?></copyright>
-    <generator url="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
-    <?php do_action('atom_head'); ?>
-    <?php while (have_posts()) : the_post(); ?>
-    <entry>
-        <author>
-            <name><?php the_author() ?></name>
-        </author>
-        <title type="text/html" mode="escaped"><![CDATA[<?php the_title_rss() ?>]]></title>
-        <link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />
-        <id><?php the_guid(); ?></id>
-        <modified><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></modified>
-        <issued><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></issued>
-        <?php the_category_rss('rdf') ?>
-        <summary type="<?php bloginfo('html_type'); ?>" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_option('rss_use_excerpt') ) : ?>
-        <content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
-<?php endif; ?>
-<?php rss_enclosure(); ?>
-<?php do_action('atom_entry'); ?>
-    </entry>
-    <?php endwhile ; ?>
-</feed>

tags/2.2/wp-blog-header.php

-                      r5468
+                      r5480
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
     if ( strstr( $_SERVER['PHP_SELF'], 'wp-admin') ) $path = '';
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
     else $path = 'wp-admin/';
+  require_once( dirname(__FILE__) . '/wp-includes/functions.php');
+  wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress &rsaquo; Error");
+    require_once( dirname(__FILE__) . '/wp-includes/classes.php');
+    require_once( dirname(__FILE__) . '/wp-includes/functions.php');
+    require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
+    wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress &rsaquo; Error");
+}

tags/2.2/wp-comments-post.php

-                      r5468
+                      r5480
 <?php
+if ($_SERVER["REQUEST_METHOD"] != "POST") {
+    header('Allow: POST');
+    header("HTTP/1.1 405 Method Not Allowed");
+    header("Content-type: text/plain");
+    exit;
+}
 require( dirname(__FILE__) . '/wp-config.php' );
 …
+}
 $comment_author       = trim($_POST['author']);
+$comment_author       = trim(strip_tags($_POST['author']));
 $comment_author_email = trim($_POST['email']);
 $comment_author_url   = trim($_POST['url']);

tags/2.2/wp-commentsrss2.php

-                      r5468
+                      r5480
+}
 header('Content-type: text/xml;charset=' . get_option('blog_charset'), true);
+require (ABSPATH . WPINC . '/feed-rss2-comments.php');
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 ?>
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
-<rss version="2.0"
-    xmlns:content="http://purl.org/rss/1.0/modules/content/">
-<channel>
-<?php
-$i = 0;
-if (have_posts()) :
-  while (have_posts()) : the_post();
-    if ($i < 1) {
-        $i++;
-?>
-    <title><?php if (is_single() || is_page() ) { printf(__('Comments on: %s'), get_the_title_rss()); } else { printf(__('Comments for %s'), get_bloginfo_rss("name")); } ?></title>
-    <link><?php (is_single()) ? permalink_single_rss() : bloginfo_rss("url") ?></link>
-    <description><?php bloginfo_rss("description") ?></description>
-    <pubDate><?php echo gmdate('r'); ?></pubDate>
-    <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator>
-<?php
-        if (is_single() || is_page()) {
-            $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email,
-            comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID,
-            $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments
-            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE comment_post_ID = '" . get_the_ID() . "'
-            AND $wpdb->comments.comment_approved = '1' AND $wpdb->posts.post_status = 'publish'
-            AND post_date_gmt < '" . gmdate("Y-m-d H:i:59") . "'
-            ORDER BY comment_date_gmt ASC" );
-        } else { // if no post id passed in, we'll just ue the last 10 comments.
-            $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email,
-            comment_author_url, comment_date, comment_date_gmt, comment_content, comment_post_ID,
-            $wpdb->posts.ID, $wpdb->posts.post_password FROM $wpdb->comments
-            LEFT JOIN $wpdb->posts ON comment_post_id = id WHERE $wpdb->posts.post_status = 'publish'
-            AND $wpdb->comments.comment_approved = '1' AND post_date_gmt < '" . gmdate("Y-m-d H:i:s") . "'
-            ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss') );
+        }
-    // this line is WordPress' motor, do not delete it.
-        if ($comments) {
-            foreach ($comments as $comment) {
-                $GLOBALS['comment'] =& $comment;
-                // Some plugins may need to know the metadata
-                // associated with this comment's post:
-                get_post_custom($comment->comment_post_ID);
-?>
-    <item>
-        <title><?php if ( ! (is_single() || is_page()) ) {
-            $title = get_the_title($comment->comment_post_ID);
-            $title = apply_filters('the_title', $title);
-            $title = apply_filters('the_title_rss', $title);
-            printf(__('Comment on %1$s by %2$s'), $title, get_comment_author_rss());
-        } else {
-            printf(__('By: %s'), get_comment_author_rss());
-        } ?></title>
-        <link><?php comment_link() ?></link>
-        <author><?php echo get_comment_author_rss() ?></author>
-        <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></pubDate>
-        <guid><?php comment_link() ?></guid>
-            <?php
-            if (!empty($comment->post_password) && $_COOKIE['wp-postpass'] != $comment->post_password) {
-            ?>
-        <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
-        <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
-            <?php
-            } else {
-            ?>
-        <description><?php comment_text_rss() ?></description>
-        <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-            <?php
-            } // close check for password
-            do_action('commentrss2_item', $comment->comment_ID, $comment->comment_post_ID);
-            ?>
-    </item>
-<?php
+            }
+        }
+    }
-endwhile; endif;
-?>
-</channel>
-</rss>

tags/2.2/wp-config-sample.php

Property svn:eol-style changed from native to CRLF

-                      r5468
+                      r5480
 <?php
 // ** MySQL settings ** //
 define('DB_NAME', 'wordpress');    // The name of the database
 define('DB_USER', 'username');     // Your MySQL username
 define('DB_PASSWORD', 'password'); // ...and password
+define('DB_NAME', 'putyourdbnamehere');    // The name of the database
+define('DB_USER', 'usernamehere');     // Your MySQL username
+define('DB_PASSWORD', 'yourpasswordhere'); // ...and password
 define('DB_HOST', 'localhost');    // 99% chance you won't need to change this value
+define('DB_CHARSET', 'utf8');
+define('DB_COLLATE', '');
 // You can have multiple installations in one database if you give each a unique prefix
 …
 // Change this to localize WordPress.  A corresponding MO file for the
 // chosen language must be installed to wp-includes/languages.
 // For example, install de.mo to wp-includes/languages and set WPLANG to 'de'
+// chosen language must be installed to wp-content/languages.
+// For example, install de.mo to wp-content/languages and set WPLANG to 'de'
 // to enable German language support.
 define ('WPLANG', '');

tags/2.2/wp-content/index.php

Property svn:eol-style set to native

tags/2.2/wp-content/themes/classic/comments-popup.php

-                      r5468
+                      r5480
 <h2 id="comments"><?php _e("Comments"); ?></h2>
 <p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e("<abbr title=\"Really Simple Syndication\">RSS</abbr> feed for comments on this post."); ?></a></p>
 <?php if ('open' == $post->ping_status) { ?>
 …
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<?php if ( $user_ID ) : ?>
+    <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
+<?php else : ?>
     <p>
       <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
 …
        <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
     </p>
+<?php endif; ?>
     <p>

tags/2.2/wp-content/themes/classic/sidebar.php

-                      r5468
+                      r5480
 <ul>
+<?php   /* Widgetized sidebar, if you have the plugin installed. */
+        if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
     <?php wp_list_pages('title_li=' . __('Pages:')); ?>
     <?php wp_list_bookmarks('title_after=&title_before='); ?>
 …
     </ul>
  </li>
+<?php endif; ?>
 </ul>

tags/2.2/wp-content/themes/default/archive.php

r5468	r5480
7	7	<?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
8	8	<?php /* If this is a category archive */ if (is_category()) { ?>
9		<h2 class="pagetitle">Archive for the ‘<?php ~~echo~~ single_cat_title(); ?>’ Category</h2>
	9	<h2 class="pagetitle">Archive for the ‘<?php single_cat_title(); ?>’ Category</h2>
10	10
11	11	<?php /* If this is a daily archive */ } elseif (is_day()) { ?>

tags/2.2/wp-content/themes/default/attachment.php

Property svn:eol-style set to native

tags/2.2/wp-content/themes/default/comments-popup.php

-                      r5468
+                      r5480
 <h2 id="comments">Comments</h2>
 <p><a href="<?php echo get_option('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
 <?php if ('open' == $post->ping_status) { ?>
 …
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<?php if ( $user_ID ) : ?>
+    <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
+<?php else : ?>
     <p>
       <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
 …
        <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
     </p>
+<?php endif; ?>
     <p>

tags/2.2/wp-content/themes/default/comments.php

-                      r5468
+                      r5480
             ?>
             <p class="nocomments">This post is password protected. Enter the password to view comments.<p>
+            <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
             <?php
 …
     /* This variable is for alternating comment background */
     $oddcomment = 'alt';
+    $oddcomment = 'class="alt" ';
 ?>
 …
     <?php foreach ($comments as $comment) : ?>
         <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
+        <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
             <cite><?php comment_author_link() ?></cite> Says:
             <?php if ($comment->comment_approved == '0') : ?>
 …
             <br />
             <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
+            <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('edit','&nbsp;&nbsp;',''); ?></small>
             <?php comment_text() ?>
 …
         </li>
     <?php /* Changes every other comment to a different class */
         if ('alt' == $oddcomment) $oddcomment = '';
         else $oddcomment = 'alt';
+    <?php
+        /* Changes every other comment to a different class */
+        $oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : '';
     ?>
 …
 <?php endif; ?>
 <!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>

tags/2.2/wp-content/themes/default/footer.php

r5468	r5480
2	2	<hr />
3	3	<div id="footer">
4		<!-- If you'd like to support WordPress, having the "powered by" link someone on your blog is the best way, it's our only promotion or advertising. -->
	4	<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way, it's our only promotion or advertising. -->
5	5	<p>
6	6	<?php bloginfo('name'); ?> is proudly powered by

tags/2.2/wp-content/themes/default/functions.php

-                      r5468
+                      r5480
 <?php
+if ( function_exists('register_sidebar') )
+    register_sidebar(array(
+        'before_widget' => '<li id="%1$s" class="widget %2$s">',
+        'after_widget' => '</li>',
+        'before_title' => '<h2 class="widgettitle">',
+        'after_title' => '</h2>',
+    ));
 function kubrick_head() {
 …
 function kubrick_upper_color() {
     if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+    if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
         parse_str(substr($url, strpos($url, '?') + 1), $q);
         return $q['upper'];
 …
 function kubrick_lower_color() {
     if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+    if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
         parse_str(substr($url, strpos($url, '?') + 1), $q);
         return $q['lower'];
 …
     if ( $_GET['page'] == basename(__FILE__) ) {
         if ( 'save' == $_REQUEST['action'] ) {
+            check_admin_referer('kubrick-header');
             if ( isset($_REQUEST['njform']) ) {
                 if ( isset($_REQUEST['defaults']) ) {
 …
                     if ( '' == $_REQUEST['njfontcolor'] )
                         delete_option('kubrick_header_color');
+                    else
+                        update_option('kubrick_header_color', $_REQUEST['njfontcolor']);
+                    else {
+                        $fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']);
+                        update_option('kubrick_header_color', $fontcolor);
+                    }
                     if ( preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njuppercolor'], $uc) && preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njlowercolor'], $lc) ) {
                         $uc = ( strlen($uc[0]) == 3 ) ? $uc[0]{0}.$uc[0]{0}.$uc[0]{1}.$uc[0]{1}.$uc[0]{2}.$uc[0]{2} : $uc[0];
                         $lc = ( strlen($lc[0]) == 3 ) ? $lc[0]{0}.$lc[0]{0}.$lc[0]{1}.$lc[0]{1}.$lc[0]{2}.$lc[0]{2} : $lc[0];
                         update_option('kubrick_header_image', "header-img.php?upper=$uc&amp;lower=$lc");
+                        update_option('kubrick_header_image', "header-img.php?upper=$uc&lower=$lc");
+                    }
 …
                 if ( isset($_REQUEST['headerimage']) ) {
+                    check_admin_referer('kubrick-header');
                     if ( '' == $_REQUEST['headerimage'] )
                         delete_option('kubrick_header_image');
+                    else
+                        update_option('kubrick_header_image', $_REQUEST['headerimage']);
+                    else {
+                        $headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']);
+                        update_option('kubrick_header_image', $headerimage);
+                    }
+                }
                 if ( isset($_REQUEST['fontcolor']) ) {
+                    check_admin_referer('kubrick-header');
                     if ( '' == $_REQUEST['fontcolor'] )
                         delete_option('kubrick_header_color');
+                    else
+                        update_option('kubrick_header_color', $_REQUEST['fontcolor']);
+                    else {
+                        $fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']);
+                        update_option('kubrick_header_color', $fontcolor);
+                    }
+                }
                 if ( isset($_REQUEST['fontdisplay']) ) {
+                    check_admin_referer('kubrick-header');
                     if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] )
                         delete_option('kubrick_header_display');
 …
         add_action('admin_head', 'kubrick_theme_page_head');
+    }
     add_theme_page('Customize Header', 'Header Image and Color', 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
+    add_theme_page(__('Customize Header'), __('Header Image and Color'), 'edit_themes', basename(__FILE__), 'kubrick_theme_page');
+}
 …
+    }
     function PopupWindow_populate(contents) {
         contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="Close Color Picker" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
+        contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
         this.contents = contents;
         this.populated = false;
 …
+    }
     function kRevert() {
         document.getElementById('headerimage').value = '<?php echo kubrick_header_image(); ?>';
         document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo kubrick_upper_color(); ?>';
         document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo kubrick_lower_color(); ?>';
         document.getElementById('header').style.background = 'url("<?php echo kubrick_header_image_url(); ?>") center no-repeat';
+        document.getElementById('headerimage').value = '<?php echo js_escape(kubrick_header_image()); ?>';
+        document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo js_escape(kubrick_upper_color()); ?>';
+        document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo js_escape(kubrick_lower_color()); ?>';
+        document.getElementById('header').style.background = 'url("<?php echo js_escape(kubrick_header_image_url()); ?>") center no-repeat';
         document.getElementById('header').style.color = '';
         document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo kubrick_header_color_string(); ?>';
         document.getElementById('fontdisplay').value = '<?php echo kubrick_header_display_string(); ?>';
+        document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo js_escape(kubrick_header_color_string()); ?>';
+        document.getElementById('fontdisplay').value = '<?php echo js_escape(kubrick_header_display_string()); ?>';
         document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
+    }
 …
 function kubrick_theme_page() {
     if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>Options saved.</strong></p></div>';
+    if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>';
 ?>
 <div class='wrap'>
     <div id="kubrick-header">
         <h2>Header Image and Color</h2>
+    <h2><?php _e('Header Image and Color'); ?></h2>
         <div id="headwrap">
             <div id="header">
 …
         <div id="nonJsForm">
             <form method="post" action="">
+                <div class="zerosize"><input type="submit" name="defaultsubmit" value="Save" /></div>
+                <label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br />
+                <label for="njuppercolor">Upper Color:</label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo kubrick_upper_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />
+                <label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br />
+                <input type="hidden" name="hi" id="hi" value="<?php echo kubrick_header_image(); ?>" />
+                <input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" />
+                <input type="submit" name="defaults" value="Use Defaults" />
+                <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;Save&nbsp;&nbsp;" />
+                <?php wp_nonce_field('kubrick-header'); ?>
+                <div class="zerosize"><input type="submit" name="defaultsubmit" value="<?php echo attribute_escape(__('Save')); ?>" /></div>
+                    <label for="njfontcolor"><?php _e('Font Color:'); ?></label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /> <?php printf(__('Any CSS color (%s or %s or %s)'), '<code>red</code>', '<code>#FF0000</code>', '<code>rgb(255, 0, 0)</code>'); ?><br />
+                    <label for="njuppercolor"><?php _e('Upper Color:'); ?></label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
+                <label for="njlowercolor"><?php _e('Lower Color:'); ?></label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
+                <input type="hidden" name="hi" id="hi" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />
+                <input type="submit" name="toggledisplay" id="toggledisplay" value="<?php echo attribute_escape(__('Toggle Text')); ?>" />
+                <input type="submit" name="defaults" value="<?php echo attribute_escape(__('Use Defaults')); ?>" />
+                <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _e('Save'); ?>&nbsp;&nbsp;" />
                 <input type="hidden" name="action" value="save" />
                 <input type="hidden" name="njform" value="true" />
 …
         <div id="jsForm">
             <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
+                <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="Font Color"></input>
+                <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="Upper Color"></input>
+                <input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="Lower Color"></input>
+                <input type="button" name="revert" value="Revert" onclick="kRevert()" />
+                <input type="button" value="Advanced" onclick="toggleAdvanced()" />
+                <?php wp_nonce_field('kubrick-header'); ?>
+    <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input>
+        <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input>
+        <input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input>
+                <input type="button" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" />
+                <input type="button" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" />
                 <input type="hidden" name="action" value="save" />
                 <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" />
                 <input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" />
                 <input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" />
                 <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" />
                 <input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" />
                 <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
+                <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" />
+                <input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" />
+                <input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo attribute_escape(kubrick_upper_color()); ?>" />
+                <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" />
+                <input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" />
+                <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header &raquo;')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
             </form>
             <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
             <div id="advanced">
                 <form id="jsAdvanced" style="display:none;" action="">
+                    <label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br />
+                    <label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br />
+                    <label for="advlowercolor">Lower Color (HEX): </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo kubrick_lower_color(); ?>" /><br />
+                    <input type="button" name="default" value="Select Default Colors" onclick="kDefaults()" /><br />
+                    <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="Toggle Text Display"></input><br />
+                    <?php wp_nonce_field('kubrick-header'); ?>
+                    <label for="advfontcolor"><?php _e('Font Color (CSS):'); ?> </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /><br />
+                    <label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br />
+                    <label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br />
+                    <input type="button" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />
+                    <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br />
                 </form>
             </div>

tags/2.2/wp-content/themes/default/header.php

r5468	r5480
19	19	if ( !$withcomments && !is_single() ) {
20	20	?>
21		#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg.jpg") repeat-y top; border: none; }
	21	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
22	22	<?php } else { // No sidebar ?>
23	23	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }

tags/2.2/wp-content/themes/default/searchform.php

r5468	r5480
1		<form method="get" id="searchform" action="<?php bloginfo('~~home~~'); ?>/">
	1	<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
2	2	<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
3	3	<input type="submit" id="searchsubmit" value="Search" />

tags/2.2/wp-content/themes/default/sidebar.php

-                      r5468
+                      r5480
     <div id="sidebar">
         <ul>
+            <?php   /* Widgetized sidebar, if you have the plugin installed. */
+                    if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
             <li>
                 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
 …
             -->
+            <li>
+            <?php if ( is_404() || is_category() || is_day() || is_month() ||
+                        is_year() || is_search() || is_paged() ) {
+            ?> <li>
             <?php /* If this is a 404 page */ if (is_404()) { ?>
             <?php /* If this is a category archive */ } elseif (is_category()) { ?>
 …
             <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for the day <?php the_time('l, F jS, Y'); ?>.</p>
             <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for <?php the_time('F, Y'); ?>.</p>
             <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
             <p>You are currently browsing the <a href="<?php bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for the year <?php the_time('Y'); ?>.</p>
             <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
             <p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
+            <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
             for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
             <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
             <p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
+            <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
             <?php } ?>
+            </li>
+            </li> <?php }?>
             <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
 …
                 </li>
             <?php } ?>
+            <?php endif; ?>
         </ul>
     </div>

tags/2.2/wp-cron.php

r5468	r5480
4	4	require_once('wp-config.php');
5	5
6		if ( $_GET['check'] != ~~md5(DB_PASS .~~ '187425') )
	6	if ( $_GET['check'] != wp_hash('187425') )
7	7	exit;
8	8

tags/2.2/wp-includes/author-template.php

-                      r5468
+                      r5480
 function wp_list_authors($args = '') {
+    global $wpdb;
     if ( is_array($args) )
         $r = &$args;
 …
     $r = array_merge($defaults, $r);
     extract($r);
+    global $wpdb;
     // TODO:  Move select to get_authors().
+    $query = "SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name";
+    $authors = $wpdb->get_results($query);
+    $authors = $wpdb->get_results("SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name");
+    $author_count = array();
+    foreach ((array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_status = 'publish' GROUP BY post_author") as $row) {
+        $author_count[$row->post_author] = $row->count;
+    }
     foreach ( (array) $authors as $author ) {
         $author = get_userdata( $author->ID );
         $posts = get_usernumposts($author->ID);
+        $posts = (isset($author_count[$author->ID])) ? $author_count[$author->ID] : 0;
         $name = $author->nickname;

tags/2.2/wp-includes/bookmark-template.php

-                      r5468
+                      r5480
         if ( $show_description && '' != $desc )
             $output .= $between . $desc;
+        if ($show_rating) {
+            $output .= $between . get_linkrating($row);
+        }
         $output .= "$after\n";
 …
             $rel = ' rel="' . $rel . '"';
         $desc = attribute_escape($bookmark->link_description);
+        $name = attribute_escape($bookmark->link_name);
         $title = $desc;
+        $desc = attribute_escape(apply_filters('link_description', $bookmark->link_description));
+        $name = attribute_escape(apply_filters('link_title', $bookmark->link_name));
+        $title = $desc;
         if ( $show_updated )
 …
         if ( $show_description && '' != $desc )
             $output .= $between . $desc;
+        if ($show_rating) {
+            $output .= $between . get_linkrating($bookmark);
+        }
         $output .= "$after\n";
     } // end while
 …
         foreach ( (array) $cats as $cat ) {
+            $bookmarks = get_bookmarks("limit=$limit&category={$cat->cat_ID}&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_invisible&show_updated=$show_updated");
+            $params = array_merge($r, array('category'=>$cat->cat_ID));
+            $bookmarks = get_bookmarks($params);
             if ( empty($bookmarks) )
                 continue;
             $output .= str_replace(array('%id', '%class'), array("linkcat-$cat->cat_ID", $class), $category_before);
+            $output .= "$title_before$cat->cat_name$title_after\n\t<ul>\n";
+            $catname = apply_filters( "link_category", $cat->cat_name );
+            $output .= "$title_before$catname$title_after\n\t<ul>\n";
             $output .= _walk_bookmarks($bookmarks, $r);
             $output .= "\n\t</ul>\n$category_after\n";
 …
     } else {
         //output one single list using title_li for the title
         $bookmarks = get_bookmarks("limit=$limit&category=$category&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_invisible&show_updated=$show_updated");
+        $bookmarks = get_bookmarks($r);
         if ( !empty($bookmarks) ) {
             if ( !empty( $title_li ) ){

tags/2.2/wp-includes/bookmark.php

-                      r5468
+                      r5480
     if (!empty($exclusions))
         $exclusions .= ')';
     if ( ! empty($category_name) ) {
         if ( $cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category_name' LIMIT 1") )
 …
     $cache[ $key ] = $results;
     wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+    wp_cache_add( 'get_bookmarks', $cache, 'bookmark' );
     return apply_filters('get_bookmarks', $results, $r);

tags/2.2/wp-includes/cache.php

-                      r5468
+                      r5480
                     $this->cache['category'][$catt->cat_ID] = $catt;
+            }
+        } else
+            if ('options' == $group) {
+                $wpdb->hide_errors();
+                if (!$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'")) {
+                    $options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
+                }
+                $wpdb->show_errors();
+                if ( ! $options )
+                    return;
+                foreach ($options as $option) {
+                    $this->cache['options'][$option->option_name] = $option->option_value;
+                }
+            }
+        }
+    }
 …
                 fclose($fd);
                 if (!@ rename($temp_file, $cache_file)) {
+                    if (@ copy($temp_file, $cache_file))
+                        @ unlink($temp_file);
+                    else
+                    if (!@ copy($temp_file, $cache_file))
                         $errors++;
+                    @ unlink($temp_file);
+                }
                 @ chmod($cache_file, $file_perms);
 …
         return $this->__construct();
+    }
     function __construct() {
         global $blog_id;
 …
     function __destruct() {
         $this->save();
         return true;
+        return true;
+    }
+}

tags/2.2/wp-includes/category-template.php

-                      r5468
+                      r5480
         if ( $parent = $category->category_parent )
             $category_nicename = get_category_parents($parent, false, '/', true) . $category_nicename . '/';
+            $category_nicename = get_category_parents($parent, false, '/', true) . $category_nicename;
         $catlink = str_replace('%category%', $category_nicename, $catlink);
         $catlink = get_option('home') . trailingslashit($catlink);
+        $catlink = get_option('home') . user_trailingslashit($catlink, 'category');
+    }
     return apply_filters('category_link', $catlink, $category_id);
 …
     if ( !empty($categories) )
         sort($categories);
+        usort($categories, '_get_the_category_usort');
     else
         $categories = array();
     return $categories;
+}
+function _get_the_category_usort($a, $b) {
+    return strcmp($a->category_name, $b->category_name);
+}
 …
 function get_the_category_list($separator = '', $parents='') {
+    global $wp_rewrite;
     $categories = get_the_category();
     if (empty($categories))
         return apply_filters('the_category', __('Uncategorized'), $separator, $parents);
+    $rel = ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
     $thelist = '';
 …
                     if ($category->category_parent)
                         $thelist .= get_category_parents($category->category_parent, TRUE);
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>';
                     break;
                 case 'single':
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . ' rel="category tag">';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>';
                     if ($category->category_parent)
                         $thelist .= get_category_parents($category->category_parent, FALSE);
 …
                 case '':
                 default:
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a></li>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a></li>';
+            }
+        }
 …
                     if ( $category->category_parent )
                         $thelist .= get_category_parents($category->category_parent, TRUE);
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>';
                     break;
                 case 'single':
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>';
                     if ( $category->category_parent )
                         $thelist .= get_category_parents($category->category_parent, FALSE);
 …
                 case '':
                 default:
                     $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" rel="category tag">'.$category->cat_name.'</a>';
+                    $thelist .= '<a href="' . get_category_link($category->cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_name.'</a>';
+            }
             ++$i;
 …
         global $wp_query;
+        if( !empty($show_option_all) )
+            if ('list' == $style )
+                $output .= '<li><a href="' .  get_bloginfo('url')  . '">' . $show_option_all . '</a></li>';
+            else
+                $output .= '<a href="' .  get_bloginfo('url')  . '">' . $show_option_all . '</a>';
         if ( is_category() )
             $r['current_category'] = $wp_query->get_queried_object_id();

tags/2.2/wp-includes/category.php

-                      r5468
+                      r5480
     if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
         $cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
         wp_cache_set('all_category_ids', $cat_ids, 'category');
+        wp_cache_add('all_category_ids', $cat_ids, 'category');
+    }
 …
+    }
+    if ( $child_of || $hierarchical )
+        $categories = & _get_cat_children($child_of, $categories);
+    if ( $child_of || $hierarchical ) {
+        $children = _get_category_hierarchy();
+        if ( ! empty($children) )
+            $categories = & _get_cat_children($child_of, $categories);
+    }
     // Update category counts to include children.
 …
     $cache[ $key ] = $categories;
+    wp_cache_set( 'get_categories', $cache, 'category' );
+    return apply_filters('get_categories', $categories, $r);
+    wp_cache_add( 'get_categories', $cache, 'category' );
+    $categories = apply_filters('get_categories', $categories, $r);
+    return $categories;
+}
 …
         if ( ! $_category = wp_cache_get($category, 'category') ) {
             $_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category' LIMIT 1");
             wp_cache_set($category, $_category, 'category');
+            wp_cache_add($category, $_category, 'category');
+        }
+    }
 …
     $category_list = array();
+    $has_children = _get_category_hierarchy();
+    if  ( ( 0 != $category_id ) && ! isset($has_children[$category_id]) )
+        return array();
     foreach ( $categories as $category ) {
         if ( $category->cat_ID == $category_id )
 …
         if ( $category->category_parent == $category_id ) {
             $category_list[] = $category;
+            if ( !isset($has_children[$category->cat_ID]) )
+                continue;
             if ( $children = _get_cat_children($category->cat_ID, $categories) )
                 $category_list = array_merge($category_list, $children);
 …
+}
+function _get_category_hierarchy() {
+    $children = get_option('category_children');
+    if ( is_array($children) )
+        return $children;
+    $children = array();
+    $categories = get_categories('hide_empty=0&hierarchical=0');
+    foreach ( $categories as $cat ) {
+        if ( $cat->category_parent > 0 )
+            $children[$cat->category_parent][] = $cat->cat_ID;
+    }
+    update_option('category_children', $children);
+    return $children;
+}
 ?>

tags/2.2/wp-includes/class-pop3.php

-                      r5468
+                      r5480
     * mail_fetch/setup.php
+    *
     * Copyright (c) 1999-2002 The SquirrelMail Project Team
+    * Copyright (c) 1999-2006 The SquirrelMail Project Team
+    *
     * Copyright (c) 1999 CDI (cdi@thewebmasters.net) All Rights Reserved
 …
                                 //  pop server - used for apop()
-    var $RFC1939    = TRUE;     //  Set by noop(). See rfc1939.txt
-                                //
     var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
                                 //  This must be set to true
 …
             settype($timeout,"integer");
             $this->TIMEOUT = $timeout;
+            if (!ini_get('safe_mode'))
             set_time_limit($timeout);
+        }
 …
     function update_timer () {
+        if (!ini_get('safe_mode'))
         set_time_limit($this->TIMEOUT);
         return true;
 …
         // If MAILSERVER is set, override $server with it's value
+        if (!isset($port) || !$port) {$port = 110;}
         if(!empty($this->MAILSERVER))
             $server = $this->MAILSERVER;
 …
+        }
         $fp = fsockopen("$server", $port, $errno, $errstr);
+        $fp = @fsockopen("$server", $port, $errno, $errstr);
         if(!$fp) {
 …
         $this->FP = $fp;
         $this->BANNER = $this->parse_banner($reply);
+        $this->RFC1939 = $this->noop();
+        if($this->RFC1939) {
+            $this->ERROR = _("POP3: premature NOOP OK, NOT an RFC 1939 Compliant server");
+            $this->quit();
+            return false;
+        } else
+            return true;
+    }
+    function noop () {
+        if(!isset($this->FP)) {
+            $this->ERROR = _("POP3 noop:") . ' ' . _("No connection to server");
+            return false;
+        } else {
+            $cmd = "NOOP";
+            $reply = $this->send_cmd( $cmd );
+            return( $this->is_ok( $reply ) );
+        }
+        return true;
+    }
 …
             $reply = $this->send_cmd("PASS $pass");
             if(!$this->is_ok($reply)) {
                 $this->ERROR = _("POP3 pass:") . ' ' . _("authentication failed ") . "[$reply]";
+                $this->ERROR = _("POP3 pass:") . ' ' . _("Authentication failed ") . "[$reply]";
                 $this->quit();
                 return false;
 …
                 $count = $this->last("count");
                 $this->COUNT = $count;
+                $this->RFC1939 = $this->noop();
+                if(!$this->RFC1939) {
+                    $this->ERROR = _("POP3 pass:") . ' ' . _("NOOP failed. Server not RFC 1939 compliant");
+                    $this->quit();
+                    return false;
+                } else
+                    return $count;
+                return $count;
+            }
+        }
 …
                     $count = $this->last("count");
                     $this->COUNT = $count;
+                    $this->RFC1939 = $this->noop();
+                    if(!$this->RFC1939) {
+                        $this->ERROR = _("POP3 apop:") . ' ' . _("NOOP failed. Server not RFC 1939 compliant");
+                        $this->quit();
+                        return false;
+                    } else
+                        return $count;
+                    return $count;
+                }
+            }
 …
                 return false;
+            }
             list($junk,$num,$size) = explode(" ",$reply);
+            list($junk,$num,$size) = preg_split('/\s+/',$reply);
             return $size;
+        }
 …
                 return false;
+            }
             list($thisMsg,$msgSize) = explode(" ",$line);
+            list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
             settype($thisMsg,"integer");
             if($thisMsg != $msgC)
 …
         $MsgArray = array();
         $line = fgets($fp,$buffer);
+        $line = "";
         while ( !ereg("^\.\r\n",$line))
+        {
+            $line = fgets($fp,$buffer);
+            if (preg_match("/^\s+/", $line) && $count > 0) {
+                $MsgArray[$count-1] .= $line;
+                continue;
+            }
+            if(empty($line))    { break; }
             $MsgArray[$count] = $line;
             $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
+        }
         return $MsgArray;
 …
+        }
         $Vars = explode(" ",$reply);
+        $Vars = preg_split('/\s+/',$reply);
         $count = $Vars[1];
         $size = $Vars[2];
 …
                 return false;
+            }
             list ($ok,$num,$myUidl) = explode(" ",$reply);
+            list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
             return $myUidl;
         } else {
 …
                     break;
+                }
                 list ($msg,$msgUidl) = explode(" ",$line);
+                list ($msg,$msgUidl) = preg_split('/\s+/',$line);
                 $msgUidl = $this->strip_clf($msgUidl);
                 if($count == $msg) {
 …
+        {
             $digit = substr($server_text, $count, 1);
             if ( false !== $digit ) {
+            if (!empty($digit)) {
                 if( (!$outside) && ($digit != '<') && ($digit != '>') )
+                {

tags/2.2/wp-includes/classes.php

-                      r5468
+                      r5480
             // filename, if any.  For 404 requests, this leaves us with the
             // requested permalink.
             $req_uri = str_replace($pathinfo, '', $req_uri);
+            $req_uri = str_replace($pathinfo, '', rawurldecode($req_uri));
             $req_uri = trim($req_uri, '/');
             $req_uri = preg_replace("|^$home_path|", '', $req_uri);
 …
             // If req_uri is empty or if it is a request for ourself, unset error.
             if ( empty($request) || $req_uri == $self || strstr($_SERVER['PHP_SELF'], 'wp-admin/') ) {
+            if (empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
                 if (isset($_GET['error']))
                     unset($_GET['error']);
 …
                     unset($error);
                 if ( isset($perma_query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') )
+                if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
                     unset($perma_query_vars);
 …
                     $output = call_user_func_array(array(&$this, 'start_el'), $cb_args);
+                }
                 // End the element.
                 if ( isset($element->$id_field) && $element->$id_field != 0 ) {
 …
                     $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
+                }
                 continue;
+            }
+                continue;
+            }
             // Walk the tree.
             if ( !empty($previous_element) && ($element->$parent_field == $previous_element->$id_field) ) {
 …
             $css_class .= ' current_page_parent';
         $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . attribute_escape($page->post_title) . '">' . $page->post_title . '</a>';
+        $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . attribute_escape(apply_filters('the_title', $page->post_title)) . '">' . apply_filters('the_title', $page->post_title) . '</a>';
         if ( !empty($show_date) ) {
             if ( 'modified' == $show_date )
 …
             else
                 $time = $page->post_date;
             $output .= " " . mysql2date($date_format, $time);
+        }
 …
         return $output;
+    }
     function end_el($output, $page, $depth) {
         $output .= "</li>\n";
 …
         $cat_name = attribute_escape( $category->cat_name);
+        $cat_name = apply_filters( 'list_cats', $cat_name, $category );
         $link = '<a href="' . get_category_link( $category->cat_ID ) . '" ';
         if ( $use_desc_for_title == 0 || empty($category->category_description) )
 …
             $link .= 'title="' . attribute_escape( apply_filters( 'category_description', $category->category_description, $category )) . '"';
         $link .= '>';
         $link .= apply_filters( 'list_cats', $category->cat_name, $category ).'</a>';
+        $link .= $cat_name . '</a>';
         if ( (! empty($feed_image)) || (! empty($feed)) ) {
 …
                 $link .= ')';
+        }
         if ( isset($show_count) && $show_count )
             $link .= ' (' . intval($category->category_count) . ')';
         if ( isset($show_date) && $show_date ) {
             $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);

tags/2.2/wp-includes/comment-template.php

-                      r5468
+                      r5480
+}
 function comments_number( $zero = false, $one = false, $more = false, $number = '' ) {
+function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
     global $id;
     $number = get_comments_number($id);
 …
     if ( '' != get_option('permalink_structure') )
         $tb_url = trailingslashit(get_permalink()) . 'trackback/';
     return $tb_url;
+        $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+    return apply_filters('trackback_url', $tb_url);
+}
 function trackback_url( $display = true ) {
 …
 function trackback_rdf($timezone = 0) {
     global $id;
     if (!stristr($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
     echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
             xmlns:dc="http://purl.org/dc/elements/1.1/"
             xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
         <rdf:Description rdf:about="';
     the_permalink();
     echo '"'."\n";
     echo '    dc:identifier="';
     the_permalink();
     echo '"'."\n";
     echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
     echo '    trackback:ping="'.trackback_url(0).'"'." />\n";
     echo '</rdf:RDF>';
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') !== false) {
+        echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+                xmlns:dc="http://purl.org/dc/elements/1.1/"
+                xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
+            <rdf:Description rdf:about="';
+        the_permalink();
+        echo '"'."\n";
+        echo '    dc:identifier="';
+        the_permalink();
+        echo '"'."\n";
+        echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+        echo '    trackback:ping="'.trackback_url(0).'"'." />\n";
+        echo '</rdf:RDF>';
+    }
+}
 …
     // TODO: Use API instead of SELECTs.
+    if ( empty($comment_author) ) {
+    if ( $user_ID) {
+        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND (comment_approved = '1' OR ( user_id = '$user_ID' AND comment_approved = '0' ) )  ORDER BY comment_date");
+    } else if ( empty($comment_author) ) {
         $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
     } else {
 …
+    }
+    $comments = apply_filters( 'comments_array', $comments, $post->ID );
+    // keep $comments for legacy's sake (remember $table*? ;) )
+    $comments = $wp_query->comments = apply_filters( 'comments_array', $comments, $post->ID );
+    $wp_query->comment_count = count($wp_query->comments);
     define('COMMENTS_TEMPLATE', true);
 …
     if ( 0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status ) {
         echo $none;
+        echo '<span' . ((!empty($CSSclass)) ? ' class="' . $CSSclass . '"' : '') . '>' . $none . '</span>';
         return;
+    }

tags/2.2/wp-includes/compat.php

-                      r5468
+                      r5480
+}
+// Added in PHP 5.0
+if (!function_exists('stripos')) {
+    function stripos($haystack, $needle, $offset = 0) {
+        return strpos(strtolower($haystack), strtolower($needle), $offset);
+    }
+}
 ?>

tags/2.2/wp-includes/cron.php

-                      r5468
+                      r5480
 function wp_clear_scheduled_hook( $hook ) {
     $args = array_slice( func_get_args(), 1 );
     while ( $timestamp = wp_next_scheduled( $hook, $args ) )
         wp_unschedule_event( $timestamp, $hook, $args );
 …
 function spawn_cron() {
     $crons = _get_cron_array();
     if ( !is_array($crons) )
         return;
     $keys = array_keys( $crons );
     if ( array_shift( $keys ) > time() )
 …
     $cron_url = get_option( 'siteurl' ) . '/wp-cron.php';
     $parts = parse_url( $cron_url );
+    $argyle = @ fsockopen( $parts['host'], $_SERVER['SERVER_PORT'], $errno, $errstr, 0.01 );
+    if ($parts['scheme'] == 'https') {
+        // support for SSL was added in 4.3.0
+        if (version_compare(phpversion(), '4.3.0', '>=') && function_exists('openssl_open')) {
+            $argyle = @fsockopen('ssl://' . $parts['host'], $_SERVER['SERVER_PORT'], $errno, $errstr, 0.01);
+        } else {
+            return false;
+        }
+    } else {
+        $argyle = @ fsockopen( $parts['host'], $_SERVER['SERVER_PORT'], $errno, $errstr, 0.01 );
+    }
     if ( $argyle )
         fputs( $argyle,
               "GET {$parts['path']}?check=" . md5(DB_PASS . '187425') . " HTTP/1.0\r\n"
+              "GET {$parts['path']}?check=" . wp_hash('187425') . " HTTP/1.0\r\n"
             . "Host: {$_SERVER['HTTP_HOST']}\r\n\r\n"
         );
 …
     $crons = _get_cron_array();
     if ( !is_array($crons) )
         return;

tags/2.2/wp-includes/default-filters.php

-                      r5468
+                      r5480
 add_filter('comment_text', 'convert_chars');
 add_filter('comment_text', 'make_clickable');
+add_filter('comment_text', 'make_clickable', 9);
 add_filter('comment_text', 'force_balance_tags', 25);
 add_filter('comment_text', 'wpautop', 30);
 …
 add_filter('option_ping_sites', 'privacy_ping_filter');
 add_filter('option_blog_charset', 'wp_specialchars');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
 add_filter('mce_plugins', '_mce_load_rtl_plugin');
 add_filter('mce_buttons', '_mce_add_direction_buttons');
 …
 add_action('admin_print_scripts', 'wp_print_scripts', 20);
 add_action('mce_options', '_mce_set_direction');
+add_action('init', 'smilies_init', 5);
+add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
+add_action( 'shutdown', 'wp_ob_end_flush_all', 1);
 ?>

tags/2.2/wp-includes/deprecated.php

-                      r5468
+                      r5480
 /*
  *  Deprecated global variables.
+ * Deprecated global variables.
  */
 $tableposts = $wpdb->posts;
 $tableusers = $wpdb->users;
 …
 /*
  * Deprecated functios come here to die.
+ * Deprecated functions come here to die.
  */
 // Deprecated.  Use get_post().
+// Use get_post().
 function get_postdata($postid) {
     $post = &get_post($postid);
 …
+}
 // Deprecated.  Use the new post loop.
+// Use the new post loop.
 function start_wp() {
     global $wp_query, $post;
 …
+}
-// Deprecated.
 function the_category_ID($echo = true) {
     // Grab the first cat in the list.
 …
+}
-// Deprecated.
 function the_category_head($before='', $after='') {
     global $currentcat, $previouscat;
 …
+}
 // Deprecated.  Use previous_post_link().
+// Use previous_post_link().
 function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
 …
+}
 // Deprecated.  Use next_post_link().
+// Use next_post_link().
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 …
 //
 // These are deprecated.  Use current_user_can().
+// Use current_user_can() for these.
 //
 …
     $args = add_query_arg('category', $cat_id, $args);
     wp_get_links($args);
 } // end wp_get_linksbyname
+}
 /** function get_linkobjectsbyname()
 …
+}
+// Use wp_list_cats().
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {
     $query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 …
+}
 // Deprecated.  Use wp_print_scripts() or WP_Scripts instead.
+// Use wp_print_scripts() or WP_Scripts.
 function tinymce_include() {
     wp_print_script( 'wp_tiny_mce' );
+    wp_print_script('wp_tiny_mce');
+}
 …
+}
+// Use wp_get_archives().
 function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
     $args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 …
+}
 // Deprecated. Use get_author_posts_url().
+// Use get_author_posts_url().
 function get_author_link($echo = false, $author_id, $author_nicename = '') {
     $link = get_author_posts_url($author_id, $author_nicename);
 …
+}
+// Use wp_link_pages().
 function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {
     $args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 …
+}
+// Use get_option().
 function get_settings($option) {
     return get_option($option);

tags/2.2/wp-includes/feed.php

-                      r5468
+                      r5480
 function get_bloginfo_rss($show = '') {
     $info = strip_tags(get_bloginfo($show));
     return apply_filters('bloginfo_rss', convert_chars($info));
+    return apply_filters('get_bloginfo_rss', convert_chars($info));
+}
 function bloginfo_rss($show = '') {
+    echo get_bloginfo_rss($show);
+}
+    echo apply_filters('bloginfo_rss', get_bloginfo_rss($show));
+}
+function get_wp_title_rss($sep = '&#187;') {
+    $title = wp_title($sep, false);
+    $title = apply_filters('get_wp_title_rss', $title);
+    return $title;
+}
+function wp_title_rss($sep = '&#187;') {
+    echo apply_filters('wp_title_rss', get_wp_title_rss($sep));
+}
 function get_the_title_rss() {
 …
 function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = '') {
     $url = comments_rss($commentsrssfilename);
+function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'nolongerused') {
+    $url = get_post_comments_feed_link();
     echo "<a href='$url'>$link_text</a>";
+}
+function comments_rss($commentsrssfilename = '') {
+    global $id;
+    if ( '' != get_option('permalink_structure') )
+        $url = trailingslashit( get_permalink() ) . 'feed/';
+    else
+        $url = get_option('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
+    return apply_filters('post_comments_feed_link', $url);
+function comments_rss($commentsrssfilename = 'nolongerused') {
+    return get_post_comments_feed_link();
+}
 …
     } else {
         $link = get_author_posts_url($author_id, $author_nicename);
         $link = $link . "feed/";
+        $link = $link . user_trailingslashit('feed', 'feed');
+    }
 …
     } else {
         $link = get_category_link($cat_ID);
         $link = $link . "feed/";
+        $link = $link . user_trailingslashit('feed', 'feed');
+    }
 …
 function get_the_category_rss($type = 'rss') {
     $categories = get_the_category();
+    $home = get_bloginfo_rss('home');
     $the_list = '';
     foreach ( (array) $categories as $category ) {
 …
         if ( 'rdf' == $type )
             $the_list .= "\n\t\t<dc:subject><![CDATA[$category->cat_name]]></dc:subject>\n";
+        if ( 'atom' == $type )
+            $the_list .= "<category scheme='$home' term='$category->cat_name' />";
         else
             $the_list .= "\n\t\t<category><![CDATA[$category->cat_name]]></category>\n";
 …
 function the_category_rss($type = 'rss') {
     echo get_the_category_rss($type);
+}
+function html_type_rss() {
+    $type = get_bloginfo('html_type');
+    if (strpos($type, 'xhtml') !== false)
+        $type = 'xhtml';
+    else
+        $type = 'html';
+    echo $type;
+}
 …
         return;
+    $custom_fields = get_post_custom();
+    if ( is_array($custom_fields) ) {
+        while ( list($key, $val) = each($custom_fields) ) {
+            if ( $key == 'enclosure' ) {
+                if ( is_array($val) ) {
+                    foreach ( (array) $val as $enc ) {
+                        $enclosure = split( "\n", $enc );
+                        print "<enclosure url='".trim( htmlspecialchars($enclosure[ 0 ]) )."' length='".trim( $enclosure[ 1 ] )."' type='".trim( $enclosure[ 2 ] )."'/>\n";
+                    }
+                }
+    foreach (get_post_custom() as $key => $val) {
+        if ($key == 'enclosure') {
+            foreach ((array)$val as $enc) {
+                $enclosure = split("\n", $enc);
+                echo apply_filters('rss_enclosure', '<enclosure url="' . trim(htmlspecialchars($enclosure[0])) . '" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
+            }
+        }
 …
+}
+function atom_enclosure() {
+    global $id, $post;
+    if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+        return;
+    foreach (get_post_custom() as $key => $val) {
+        if ($key == 'enclosure') {
+            foreach ((array)$val as $enc) {
+                $enclosure = split("\n", $enc);
+                echo apply_filters('atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
+            }
+        }
+    }
+}
 ?>

tags/2.2/wp-includes/formatting.php

-                      r5468
+                      r5480
     $dynamic_characters = array('/\'(\d\d(?:&#8217;|\')?s)/', '/(\s|\A|")\'/', '/(\d+)"/', '/(\d+)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A)"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/(\d+)x(\d+)/');
     $dynamic_replacements = array('&#8217;$1','$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1&#8220;$2', '&#8221;$1', '&#8217;$1', '$1&#215;$2');
+    $dynamic_replacements = array('&#8217;$1','$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1&#8220;$2', '&#8221;$1', '&#8217;$1', '$1&#215;$2');
     for ( $i = 0; $i < $stop; $i++ ) {
 …
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
             // regular expressions
             $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
         } elseif ( strstr($curl, '<code') || strstr($curl, '<pre') || strstr($curl, '<kbd') || strstr($curl, '<style') || strstr($curl, '<script') ) {
+        } elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
             $next = false;
         } else {
 …
     $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
     // Space things out a little
     $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|style|script|object|input|param|p|h[1-6])';
+    $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|input|p|h[1-6]|hr)';
     $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
 …
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
     $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
     if ( strstr( $pee, '<pre' ) )
+    if (strpos($pee, '<pre') !== false)
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 …
 function trailingslashit($string) {
+        if ( '/' != substr($string, -1)) {
+                $string .= '/';
+        }
+        return $string;
+    return untrailingslashit($string) . '/';
+}
+function untrailingslashit($string) {
+    return rtrim($string, '/');
+}
 …
+function stripslashes_deep($value)
+{
+function stripslashes_deep($value) {
      $value = is_array($value) ?
+                             array_map('stripslashes_deep', $value) :
+                             stripslashes($value);
+         array_map('stripslashes_deep', $value) :
+         stripslashes($value);
+     return $value;
+}
+function urlencode_deep($value) {
+     $value = is_array($value) ?
+         array_map('urlencode_deep', $value) :
+         urlencode($value);
      return $value;
 …
 function is_email($user_email) {
     $chars = "/^([a-z0-9+_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,6}\$/i";
     if(strstr($user_email, '@') && strstr($user_email, '.')) {
+    if (strpos($user_email, '@') !== false && strpos($user_email, '.') !== false) {
         if (preg_match($chars, $user_email)) {
             return true;
 …
     // Append http unless a relative link starting with / or a php file.
     if ( strpos($url, '://') === false &&
         substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9]+?\.php/i', $url) )
+        substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9-]+?\.php/i', $url) )
         $url = 'http://' . $url;

tags/2.2/wp-includes/functions.php

-                      r5468
+                      r5480
         return false;
+    }
+    $i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4));
+    $i = mktime(
+        (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ),
+        (int) substr( $m, 5, 2 ), (int) substr( $m, 8, 2 ), (int) substr( $m, 0, 4 )
+    );
     if( 'U' == $dateformatstring )
 …
     global $wpdb;
+    $value = wp_cache_get($setting, 'options');
+    if ( false === $value ) {
+        if ( defined('WP_INSTALLING') )
+            $wpdb->hide_errors();
+        $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
+        if ( defined('WP_INSTALLING') )
+            $wpdb->show_errors();
+        if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
+            $value = $row->option_value;
+            wp_cache_set($setting, $value, 'options');
+        } else {
+            return false;
+    // Allow plugins to short-circuit options.
+    $pre = apply_filters( 'pre_option_' . $setting, false );
+    if ( $pre )
+        return $pre;
+    // prevent non-existent options from triggering multiple queries
+    $notoptions = wp_cache_get('notoptions', 'options');
+    if ( isset($notoptions[$setting]) )
+        return false;
+    $alloptions = wp_load_alloptions();
+    if ( isset($alloptions[$setting]) ) {
+        $value = $alloptions[$setting];
+    } else {
+        $value = wp_cache_get($setting, 'options');
+        if ( false === $value ) {
+            if ( defined('WP_INSTALLING') )
+                $wpdb->hide_errors();
+            $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
+            if ( defined('WP_INSTALLING') )
+                $wpdb->show_errors();
+            if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
+                $value = $row->option_value;
+                wp_cache_add($setting, $value, 'options');
+            } else { // option does not exist, so we must cache its non-existence
+                $notoptions[$setting] = true;
+                wp_cache_set('notoptions', $notoptions, 'options');
+                return false;
+            }
+        }
+    }
 …
     return apply_filters( 'option_' . $setting, maybe_unserialize($value) );
+}
+function wp_protect_special_option($option) {
+    $protected = array('alloptions', 'notoptions');
+    if ( in_array($option, $protected) )
+        die(sprintf(__('%s is a protected WP option and may not be modified'), wp_specialchars($option)));
+}
 …
+}
+function wp_load_alloptions() {
+    global $wpdb;
+    $alloptions = wp_cache_get('alloptions', 'options');
+    if ( !$alloptions ) {
+        $wpdb->hide_errors();
+        if ( !$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'") )
+            $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
+        $wpdb->show_errors();
+        $alloptions = array();
+        foreach ( (array) $alloptions_db as $o )
+            $alloptions[$o->option_name] = $o->option_value;
+        wp_cache_add('alloptions', $alloptions, 'options');
+    }
+    return $alloptions;
+}
 function update_option($option_name, $newvalue) {
     global $wpdb;
+    wp_protect_special_option($option_name);
     if ( is_string($newvalue) )
         $newvalue = trim($newvalue);
 …
     // If the new and old values are the same, no need to update.
     $oldvalue = get_option($option_name);
     if ( $newvalue == $oldvalue ) {
+    if ( $newvalue === $oldvalue ) {
         return false;
+    }
 …
+    }
+    $notoptions = wp_cache_get('notoptions', 'options');
+    if ( isset($notoptions[$option_name]) ) {
+        unset($notoptions[$option_name]);
+        wp_cache_set('notoptions', $notoptions, 'options');
+    }
     $_newvalue = $newvalue;
     $newvalue = maybe_serialize($newvalue);
+    wp_cache_set($option_name, $newvalue, 'options');
+    $alloptions = wp_load_alloptions();
+    if ( isset($alloptions[$option_name]) ) {
+        $alloptions[$option_name] = $newvalue;
+        wp_cache_set('alloptions', $alloptions, 'options');
+    } else {
+        wp_cache_set($option_name, $newvalue, 'options');
+    }
     $newvalue = $wpdb->escape($newvalue);
 …
     global $wpdb;
+    // Make sure the option doesn't already exist
+    if ( false !== get_option($name) )
+        return;
+    wp_protect_special_option($name);
+    // Make sure the option doesn't already exist we can check the cache before we ask for a db query
+    $notoptions = wp_cache_get('notoptions', 'options');
+    if ( isset($notoptions[$name]) ) {
+        unset($notoptions[$name]);
+        wp_cache_set('notoptions', $notoptions, 'options');
+    } elseif ( false !== get_option($name) ) {
+            return;
+    }
     $value = maybe_serialize($value);
+    wp_cache_set($name, $value, 'options');
+    if ( 'yes' == $autoload ) {
+        $alloptions = wp_load_alloptions();
+        $alloptions[$name] = $value;
+        wp_cache_set('alloptions', $alloptions, 'options');
+    } else {
+        wp_cache_set($name, $value, 'options');
+    }
     $name = $wpdb->escape($name);
 …
 function delete_option($name) {
     global $wpdb;
+    wp_protect_special_option($name);
     // Get the ID, if no ID then return
     $option_id = $wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = '$name'");
     if ( !$option_id ) return false;
+    $option = $wpdb->get_row("SELECT option_id, autoload FROM $wpdb->options WHERE option_name = '$name'");
+    if ( !$option->option_id ) return false;
     $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'");
+    wp_cache_delete($name, 'options');
+    if ( 'yes' == $option->autoload ) {
+        $alloptions = wp_load_alloptions();
+        if ( isset($alloptions[$name]) ) {
+            unset($alloptions[$name]);
+            wp_cache_set('alloptions', $alloptions, 'options');
+        }
+    } else {
+        wp_cache_delete($name, 'options');
+    }
     return true;
+}
 …
     wp_cache_delete('all_category_ids', 'category');
     wp_cache_delete('get_categories', 'category');
+    delete_option('category_children');
+}
 …
+    }
     if ( strstr($uri, '?') ) {
+    if (strpos($uri, '?') !== false) {
         $parts = explode('?', $uri, 2);
         if ( 1 == count($parts) ) {
 …
             $query = $parts[1];
+        }
     } else if ( !empty($protocol) || strstr($uri, '/') ) {
+    } elseif (!empty($protocol) || strpos($uri, '/') !== false) {
         $base = $uri . '?';
         $query = '';
 …
     parse_str($query, $qs);
+    if ( get_magic_quotes_gpc() )
+        $qs = stripslashes_deep($qs); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
+    $qs = urlencode_deep($qs);
     if ( is_array(func_get_arg(0)) ) {
         $kayvees = func_get_arg(0);
 …
+        }
+    }
+    $ret = trim($ret, '?');
     $ret = $protocol . $base . $ret . $frag;
+    if ( get_magic_quotes_gpc() )
+        $ret = stripslashes($ret); // parse_str() adds slashes if magicquotes is on.  See: http://php.net/parse_str
+    return trim($ret, '?');
+    $ret = trim($ret, '?');
+    return $ret;
+}
 …
         $text = 'Gone';
+    if ( version_compare(phpversion(), '4.3.0', '>=') )
+        @header("HTTP/1.1 $header $text", true, $header);
+    else
+        @header("HTTP/1.1 $header $text");
+    $protocol = $_SERVER["SERVER_PROTOCOL"];
+    if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) )
+        $protocol = 'HTTP/1.0';
+    $status_header = "$protocol $header $text";
+    $status_header = apply_filters('status_header', $status_header, $header, $text, $protocol);
+    if ( version_compare( phpversion(), '4.3.0', '>=' ) ) {
+        return @header( $status_header, true, $header );
+    } else {
+        return @header( $status_header );
+    }
+}
 …
 function do_feed() {
+    global $wp_query;
     $feed = get_query_var('feed');
 …
     $feed = preg_replace('/^_+/', '', $feed);
+    if ($feed == '' || $feed == 'feed')
+        $feed = 'rss2';
+    $for_comments = false;
+    if ( 1 != get_query_var('withoutcomments') && ( is_singular() || get_query_var('withcomments') == 1 || $feed == 'comments-rss2' ) ) {
+    if ( $feed == '' || $feed == 'feed' )
         $feed = 'rss2';
-        $for_comments = true;
+    }
     $hook = 'do_feed_' . $feed;
     do_action($hook, $for_comments);
+    do_action($hook, $wp_query->is_comment_feed);
+}
 function do_feed_rdf() {
     load_template(ABSPATH . 'wp-rdf.php');
+    load_template(ABSPATH . WPINC . '/feed-rdf.php');
+}
 function do_feed_rss() {
     load_template(ABSPATH . 'wp-rss.php');
+    load_template(ABSPATH . WPINC . '/feed-rss.php');
+}
 function do_feed_rss2($for_comments) {
     if ( $for_comments ) {
+        load_template(ABSPATH . 'wp-commentsrss2.php');
+    } else {
+        load_template(ABSPATH . 'wp-rss2.php');
+    }
+}
+function do_feed_atom() {
+    load_template(ABSPATH . 'wp-atom.php');
+        load_template(ABSPATH . WPINC . '/feed-rss2-comments.php');
+    } else {
+        load_template(ABSPATH . WPINC . '/feed-rss2.php');
+    }
+}
+function do_feed_atom($for_comments) {
+    if ($for_comments) {
+        load_template(ABSPATH . WPINC . '/feed-atom-comments.php');
+    } else {
+        load_template(ABSPATH . WPINC . '/feed-atom.php');
+    }
+}
 function do_robots() {
+    header('Content-type: text/plain; charset=utf-8');
     do_action('do_robotstxt');
     if ( '0' == get_option('blog_public') ) {
         echo "User-agent: *\n";
 …
     $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
     $wpdb->show_errors();
+    return $installed;
+    $install_status = !empty( $installed ) ? TRUE : FALSE;
+    return $install_status;
+}
 …
         $trans['moderate']['comments'] = array(__('Are you sure you want to moderate comments?'), false);
         $trans['add']['bookmark'] = array(__('Are you sure you want to add this bookmark?'), false);
         $trans['delete']['bookmark'] = array(__('Are you sure you want to delete this bookmark: &quot;%s&quot;?'), 'use_id');
         $trans['update']['bookmark'] = array(__('Are you sure you want to edit this bookmark: &quot;%s&quot;?'), 'use_id');
         $trans['bulk']['bookmarks'] = array(__('Are you sure you want to bulk modify bookmarks?'), false);
+        $trans['add']['bookmark'] = array(__('Are you sure you want to add this link?'), false);
+        $trans['delete']['bookmark'] = array(__('Are you sure you want to delete this link: &quot;%s&quot;?'), 'use_id');
+        $trans['update']['bookmark'] = array(__('Are you sure you want to edit this link: &quot;%s&quot;?'), 'use_id');
+        $trans['bulk']['bookmarks'] = array(__('Are you sure you want to bulk modify links?'), false);
         $trans['add']['page'] = array(__('Are you sure you want to add this page?'), false);
 …
+}
 function wp_die($message, $title = '') {
+function wp_die( $message, $title = '' ) {
     global $wp_locale;
+    header('Content-Type: text/html; charset=utf-8');
+    if ( empty($title) )
+        $title = __('WordPress &rsaquo; Error');
+    if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+    if ( is_wp_error( $message ) ) {
+        if ( empty($title) ) {
+            $error_data = $message->get_error_data();
+            if ( is_array($error_data) && isset($error_data['title']) )
+                $title = $error_data['title'];
+        }
+        $errors = $message->get_error_messages();
+        switch ( count($errors) ) :
+        case 0 :
+            $message = '';
+            break;
+        case 1 :
+            $message = "<p>{$errors[0]}</p>";
+            break;
+        default :
+            $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+            break;
+        endswitch;
+    } elseif ( is_string($message) ) {
+        $message = "<p>$message</p>";
+    }
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
         $admin_dir = '';
     else
         $admin_dir = 'wp-admin/';
+    if ( !did_action('admin_head') ) :
+    header('Content-Type: text/html; charset=utf-8');
+    if ( empty($title) )
+        $title = __('WordPress &rsaquo; Error');
 ?>
 …
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" />
+<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+<?php
+if ( ( $wp_locale ) && ('rtl' == $wp_locale->text_direction) ) : ?>
     <link rel="stylesheet" href="<?php echo $admin_dir; ?>install-rtl.css" type="text/css" />
 <?php endif; ?>
 </head>
 <body>
+<?php endif; ?>
     <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1>
+    <p><?php echo $message; ?></p>
+    <?php echo $message; ?>
 </body>
 </html>
 <?php
     die();
+}
+function _config_wp_home($url = '') {
+    if ( defined( 'WP_HOME' ) )
+        return WP_HOME;
+    else return $url;
+}
+function _config_wp_siteurl($url = '') {
+    if ( defined( 'WP_SITEURL' ) )
+        return WP_SITEURL;
+    else return $url;
+}
 …
     return $input;
+}
+function smilies_init() {
+    global $wpsmiliestrans, $wp_smiliessearch, $wp_smiliesreplace;
+    // don't bother setting up smilies if they are disabled
+    if ( !get_option('use_smilies') )
+        return;
+    if (!isset($wpsmiliestrans)) {
+        $wpsmiliestrans = array(
+        ':mrgreen:' => 'icon_mrgreen.gif',
+        ':neutral:' => 'icon_neutral.gif',
+        ':twisted:' => 'icon_twisted.gif',
+          ':arrow:' => 'icon_arrow.gif',
+          ':shock:' => 'icon_eek.gif',
+          ':smile:' => 'icon_smile.gif',
+            ':???:' => 'icon_confused.gif',
+           ':cool:' => 'icon_cool.gif',
+           ':evil:' => 'icon_evil.gif',
+           ':grin:' => 'icon_biggrin.gif',
+           ':idea:' => 'icon_idea.gif',
+           ':oops:' => 'icon_redface.gif',
+           ':razz:' => 'icon_razz.gif',
+           ':roll:' => 'icon_rolleyes.gif',
+           ':wink:' => 'icon_wink.gif',
+            ':cry:' => 'icon_cry.gif',
+            ':eek:' => 'icon_surprised.gif',
+            ':lol:' => 'icon_lol.gif',
+            ':mad:' => 'icon_mad.gif',
+            ':sad:' => 'icon_sad.gif',
+              '8-)' => 'icon_cool.gif',
+              '8-O' => 'icon_eek.gif',
+              ':-(' => 'icon_sad.gif',
+              ':-)' => 'icon_smile.gif',
+              ':-?' => 'icon_confused.gif',
+              ':-D' => 'icon_biggrin.gif',
+              ':-P' => 'icon_razz.gif',
+              ':-o' => 'icon_surprised.gif',
+              ':-x' => 'icon_mad.gif',
+              ':-|' => 'icon_neutral.gif',
+              ';-)' => 'icon_wink.gif',
+               '8)' => 'icon_cool.gif',
+               '8O' => 'icon_eek.gif',
+               ':(' => 'icon_sad.gif',
+               ':)' => 'icon_smile.gif',
+               ':?' => 'icon_confused.gif',
+               ':D' => 'icon_biggrin.gif',
+               ':P' => 'icon_razz.gif',
+               ':o' => 'icon_surprised.gif',
+               ':x' => 'icon_mad.gif',
+               ':|' => 'icon_neutral.gif',
+               ';)' => 'icon_wink.gif',
+              ':!:' => 'icon_exclaim.gif',
+              ':?:' => 'icon_question.gif',
+        );
+    }
+    $siteurl = get_option('siteurl');
+    foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
+        $wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\s|$)/';
+        $smiley_masked = htmlspecialchars(trim($smiley), ENT_QUOTES);
+        $wp_smiliesreplace[] = " <img src='$siteurl/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
+    }
+}
+function wp_parse_args( $args, $defaults = '' ) {
+    if ( is_array($args) ) :
+        $r =& $args;
+    else :
+        parse_str( $args, $r );
+        if ( get_magic_quotes_gpc() )
+            $r = stripslashes_deep( $r );
+    endif;
+    if ( is_array($defaults) ) :
+        extract($defaults);
+        extract($r);
+        return compact(array_keys($defaults)); // only those options defined in $defaults
+    else :
+        return $r;
+    endif;
+}
+function wp_maybe_load_widgets() {
+    if ( !function_exists( 'dynamic_sidebar' ) ) {
+        require_once ABSPATH . WPINC . '/widgets.php';
+        add_action( '_admin_menu', 'wp_widgets_add_menu' );
+    }
+}
+function wp_widgets_add_menu() {
+    global $submenu;
+    $submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_themes', 'widgets.php' );
+    ksort($submenu['themes.php'], SORT_NUMERIC);
+}
+// For PHP 5.2, make sure all output buffers are flushed
+// before our singletons our destroyed.
+function wp_ob_end_flush_all()
+{
+    while ( @ob_end_flush() );
+}
 ?>

tags/2.2/wp-includes/general-template.php

-                      r5468
+                      r5480
 function get_sidebar() {
+    do_action( 'get_sidebar' );
     if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
         load_template( TEMPLATEPATH . '/sidebar.php');
 …
 function bloginfo($show='') {
     $info = get_bloginfo($show);
+    if (!strstr($show, 'url') && //don't filter URLs
+        !strstr($show, 'directory') &&
+        !strstr($show, 'home')) {
+    // Don't filter URL's.
+    if (strpos($show, 'url') === false ||
+        strpos($show, 'directory') === false ||
+        strpos($show, 'home') === false) {
         $info = apply_filters('bloginfo', $info, $show);
         $info = convert_chars($info);
 …
+}
+/**
+ * Note: some of these values are DEPRECATED. Meaning they could be
+ * taken out at any time and shouldn't be relied upon. Options
+ * without "// DEPRECATED" are the preferred and recommended ways
+ * to get the information.
+ */
 function get_bloginfo($show='') {
     switch($show) {
         case 'url' :
         case 'home' :
         case 'siteurl' :
+        case 'home' : // DEPRECATED
+        case 'siteurl' : // DEPRECATED
             $output = get_option('home');
             break;
 …
             $output = get_feed_link('atom');
             break;
+        case 'comments_atom_url':
+            $output = get_feed_link('comments_atom');
         case 'comments_rss2_url':
             $output = get_feed_link('comments_rss2');
 …
     $author = get_query_var('author');
     $author_name = get_query_var('author_name');
     $m = (int) get_query_var('m');
     $year = (int) get_query_var('year');
     $monthnum = (int)get_query_var('monthnum');
     $day = (int) get_query_var('day');
+    $m = get_query_var('m');
+    $year = get_query_var('year');
+    $monthnum = get_query_var('monthnum');
+    $day = get_query_var('day');
     $title = '';
 …
             if ( !stristr($cat,'-') )
                 $title = apply_filters('single_cat_title', get_the_category_by_ID($cat));
+    }
+    if ( !empty($category_name) ) {
+    } elseif ( !empty($category_name) ) {
         if ( stristr($category_name,'/') ) {
                 $category_name = explode('/',$category_name);
 …
     if ( !empty($m) ) {
         $my_year = substr($m, 0, 4);
+        $my_month = $wp_locale->get_month($m);
+        $title = "$my_year $sep $my_month";
+        $my_month = $wp_locale->get_month(substr($m, 4, 2));
+        $my_day = intval(substr($m, 6, 2));
+        $title = "$my_year" . ($my_month ? "$sep $my_month" : "") . ($my_day ? "$sep $my_day" : "");
+    }
 …
     // If there is a post
     if ( is_single() || is_page() ) {
+        $queried = $wp_query->get_queried_object();
+        $title = strip_tags($queried->post_title);
+        $post = $wp_query->get_queried_object();
         $title = apply_filters('single_post_title', $title);
+        $title = strip_tags($post->post_title);
+    }
 …
     global $wp_locale;
     $m = (int) get_query_var('m');
     $year = (int) get_query_var('year');
     $monthnum = (int) get_query_var('monthnum');
+    $m = get_query_var('m');
+    $year = get_query_var('year');
+    $monthnum = get_query_var('monthnum');
     if ( !empty($monthnum) && !empty($year) ) {
 …
     $add_minutes = intval(60 * (get_option('gmt_offset') - $add_hours));
+    //filters
+    $where = apply_filters('getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
+    $join = apply_filters('getarchives_join', "", $r);
     if ( 'monthly' == $type ) {
         $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
         if ( $arcresults ) {
             $afterafter = $after;
 …
+        }
     } elseif ('yearly' == $type) {
          $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts WHERE post_type ='post' AND post_status = 'publish' GROUP BY YEAR(post_date) ORDER BY post_date DESC" . $limit);
+         $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date DESC" . $limit);
         if ($arcresults) {
             $afterafter = $after;
             foreach ($arcresults as $arcresult) {
                 $url = get_year_link($arcresult->year);
                 $text = sprintf('%d', $arcresult->year);
+            $afterafter = $after;
+            foreach ($arcresults as $arcresult) {
+                $url = get_year_link($arcresult->year);
+                $text = sprintf('%d', $arcresult->year);
                 if ($show_post_count)
                     $after = '&nbsp;('.$arcresult->posts.')' . $afterafter;
                 echo get_archives_link($url, $text, $format, $before, $after);
+            }
+        }
+                    $after = '&nbsp;('.$arcresult->posts.')' . $afterafter;
+                echo get_archives_link($url, $text, $format, $before, $after);
+            }
+        }
     } elseif ( 'daily' == $type ) {
         $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC" . $limit);
         if ( $arcresults ) {
             $afterafter = $after;
 …
     } elseif ( 'weekly' == $type ) {
         $start_of_week = get_option('start_of_week');
         $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd, count(ID) as posts FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' GROUP BY WEEK(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY WEEK(post_date, $start_of_week), YEAR(post_date) ORDER BY post_date DESC" . $limit);
         $arc_w_last = '';
         $afterafter = $after;
 …
     } elseif ( ( 'postbypost' == $type ) || ('alpha' == $type) ) {
         ('alpha' == $type) ? $orderby = "post_title ASC " : $orderby = "post_date DESC ";
         $arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY $orderby $limit");
+        $arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit");
         if ( $arcresults ) {
             foreach ( $arcresults as $arcresult ) {
 …
                     $arc_title = $arcresult->post_title;
                     if ( $arc_title )
                         $text = strip_tags($arc_title);
+                        $text = strip_tags(apply_filters('the_title', $arc_title));
                     else
                         $text = $arcresult->ID;
 …
             LIMIT 1");
     echo '<table id="wp-calendar">
+    echo '<table id="wp-calendar" summary="' . __('Calendar') . '">
     <caption>' . $wp_locale->get_month($thismonth) . ' ' . date('Y', $unixmonth) . '</caption>
     <thead>
 …
+    }
+    if ( strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') )
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false)
         $ak_title_separator = "\n";
     else
 …
     if ( $ak_post_titles ) {
         foreach ( $ak_post_titles as $ak_post_title ) {
+                $post_title = apply_filters( "the_title", $ak_post_title->post_title );
+                $post_title = str_replace('"', '&quot;', wptexturize( $post_title ));
                 if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
                     $ak_titles_for_day['day_'.$ak_post_title->dom] = '';
                 if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
                     $ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '&quot;', wptexturize($ak_post_title->post_title));
+                    $ak_titles_for_day["$ak_post_title->dom"] = $post_title;
                 else
                     $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '&quot;', wptexturize($ak_post_title->post_title));
+                    $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title;
+        }
+    }
 …
     echo $output;
     $cache[ $key ] = $output;
     wp_cache_set( 'get_calendar', $cache, 'calendar' );
+    wp_cache_add( 'get_calendar', $cache, 'calendar' );
+}
 …
 function user_can_richedit() {
     global $wp_rich_edit, $pagenow;
+    if ( !isset($wp_rich_edit) )
+        $wp_rich_edit = ( 'true' == get_user_option('rich_editing') && !preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) && 'comment.php' != $pagenow && rich_edit_exists() ) ? true : false;
+    if ( !isset( $wp_rich_edit) ) {
+        if ( get_user_option( 'rich_editing' ) == 'true' &&
+            ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
+                !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) ) ) {
+            $wp_rich_edit = true;
+        } else {
+            $wp_rich_edit = false;
+        }
+    }
     return apply_filters('user_can_richedit', $wp_rich_edit);

tags/2.2/wp-includes/gettext.php

-                      r5468
+                      r5480
 <?php
 /*
    Copyright (c) 2003 Danilo Segan <danilo@kvota.net>.
    Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
    This file is part of PHP-gettext.
    PHP-gettext is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    PHP-gettext is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with PHP-gettext; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     Copyright (c) 2003 Danilo Segan <danilo@kvota.net>.
+     Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
+     This file is part of PHP-gettext.
+     PHP-gettext is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2 of the License, or
+     (at your option) any later version.
+     PHP-gettext is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+     You should have received a copy of the GNU General Public License
+     along with PHP-gettext; if not, write to the Free Software
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 /**
  * Provides a simple gettext replacement that works independently from
 …
  * It can read MO files and use them for translating strings.
  * The files are passed to gettext_reader as a Stream (see streams.php)
+ *
+ *
  * This version has the ability to cache all strings and translations to
  * speed up the string lookup.
 …
  */
 class gettext_reader {
+  //public:
+   var $error = 0; // public variable that holds error code (0 if no error)
+   //private:
+  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  var $STREAM = NULL;
+  var $short_circuit = false;
+  var $enable_cache = false;
+  var $originals = NULL;      // offset of original table
+  var $translations = NULL;    // offset of translation table
+  var $pluralheader = NULL;    // cache header field for plural forms
+  var $total = 0;          // total string count
+  var $table_originals = NULL;  // table for original strings (offsets)
+  var $table_translations = NULL;  // table for translated strings (offsets)
+  var $cache_translations = NULL;  // original -> translation mapping
+  /* Methods */
+  /**
+   * Reads a 32bit Integer from the Stream
+   *
+   * @access private
+   * @return Integer from the Stream
+   */
+  function readint() {
+      if ($this->BYTEORDER == 0) {
+        // low endian
+        $low_end = unpack('V', $this->STREAM->read(4));
+        return array_shift($low_end);
+      } else {
+        // big endian
+        $big_end = unpack('N', $this->STREAM->read(4));
+        return array_shift($big_end);
+      }
+    }
+  /**
+   * Reads an array of Integers from the Stream
+   *
+   * @param int count How many elements should be read
+   * @return Array of Integers
+   */
+  function readintarray($count) {
+    if ($this->BYTEORDER == 0) {
+        // low endian
+        return unpack('V'.$count, $this->STREAM->read(4 * $count));
+      } else {
+        // big endian
+        return unpack('N'.$count, $this->STREAM->read(4 * $count));
+      }
+  }
+  /**
+   * Constructor
+   *
+   * @param object Reader the StreamReader object
+   * @param boolean enable_cache Enable or disable caching of strings (default on)
+   */
+  function gettext_reader($Reader, $enable_cache = true) {
+    // If there isn't a StreamReader, turn on short circuit mode.
+    if (! $Reader || isset($Reader->error) ) {
+      $this->short_circuit = true;
+      return;
+    }
+    // Caching can be turned off
+    $this->enable_cache = $enable_cache;
+    // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
+    $MAGIC1 = (int) - 1794895138;
+    // $MAGIC2 = (int)0xde120495; //bug
+    $MAGIC2 = (int) - 569244523;
+    $this->STREAM = $Reader;
+    $magic = $this->readint();
+    if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
+      $this->BYTEORDER = 0;
+    } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
+      $this->BYTEORDER = 1;
+    } else {
+      $this->error = 1; // not MO file
+      return false;
+    }
+    // FIXME: Do we care about revision? We should.
+    $revision = $this->readint();
+    $this->total = $this->readint();
+    $this->originals = $this->readint();
+    $this->translations = $this->readint();
+  }
+  /**
+   * Loads the translation tables from the MO file into the cache
+   * If caching is enabled, also loads all strings into a cache
+   * to speed up translation lookups
+   *
+   * @access private
+   */
+  function load_tables() {
+    if (is_array($this->cache_translations) &&
+      is_array($this->table_originals) &&
+      is_array($this->table_translations))
+      return;
+    /* get original and translations tables */
+    $this->STREAM->seekto($this->originals);
+    $this->table_originals = $this->readintarray($this->total * 2);
+    $this->STREAM->seekto($this->translations);
+    $this->table_translations = $this->readintarray($this->total * 2);
+    if ($this->enable_cache) {
+      $this->cache_translations = array ();
+      /* read all strings in the cache */
+      for ($i = 0; $i < $this->total; $i++) {
+        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
+        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
+        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
+        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
+        $this->cache_translations[$original] = $translation;
+      }
+    }
+  }
+  /**
+   * Returns a string from the "originals" table
+   *
+   * @access private
+   * @param int num Offset number of original string
+   * @return string Requested string if found, otherwise ''
+   */
+  function get_original_string($num) {
+    $length = $this->table_originals[$num * 2 + 1];
+    $offset = $this->table_originals[$num * 2 + 2];
+    if (! $length)
+      return '';
+    $this->STREAM->seekto($offset);
+    $data = $this->STREAM->read($length);
+    return (string)$data;
+  }
+  /**
+   * Returns a string from the "translations" table
+   *
+   * @access private
+   * @param int num Offset number of original string
+   * @return string Requested string if found, otherwise ''
+   */
+  function get_translation_string($num) {
+    $length = $this->table_translations[$num * 2 + 1];
+    $offset = $this->table_translations[$num * 2 + 2];
+    if (! $length)
+      return '';
+    $this->STREAM->seekto($offset);
+    $data = $this->STREAM->read($length);
+    return (string)$data;
+  }
+  /**
+   * Binary search for string
+   *
+   * @access private
+   * @param string string
+   * @param int start (internally used in recursive function)
+   * @param int end (internally used in recursive function)
+   * @return int string number (offset in originals table)
+   */
+  function find_string($string, $start = -1, $end = -1) {
+    if (($start == -1) or ($end == -1)) {
+      // find_string is called with only one parameter, set start end end
+      $start = 0;
+      $end = $this->total;
+    }
+    if (abs($start - $end) <= 1) {
+      // We're done, now we either found the string, or it doesn't exist
+      $txt = $this->get_original_string($start);
+      if ($string == $txt)
+        return $start;
+      else
+        return -1;
+    } else if ($start > $end) {
+      // start > end -> turn around and start over
+      return $this->find_string($string, $end, $start);
+    } else {
+      // Divide table in two parts
+      $half = (int)(($start + $end) / 2);
+      $cmp = strcmp($string, $this->get_original_string($half));
+      if ($cmp == 0)
+        // string is exactly in the middle => return it
+        return $half;
+      else if ($cmp < 0)
+        // The string is in the upper half
+        return $this->find_string($string, $start, $half);
+      else
+        // The string is in the lower half
+        return $this->find_string($string, $half, $end);
+    }
+  }
+  /**
+   * Translates a string
+   *
+   * @access public
+   * @param string string to be translated
+   * @return string translated string (or original, if not found)
+   */
+  function translate($string) {
+    if ($this->short_circuit)
+      return $string;
+    $this->load_tables();
+    if ($this->enable_cache) {
+      // Caching enabled, get translated string from cache
+      if (array_key_exists($string, $this->cache_translations))
+        return $this->cache_translations[$string];
+      else
+        return $string;
+    } else {
+      // Caching not enabled, try to find string
+      $num = $this->find_string($string);
+      if ($num == -1)
+        return $string;
+      else
+        return $this->get_translation_string($num);
+    }
+  }
+  /**
+   * Get possible plural forms from MO header
+   *
+   * @access private
+   * @return string plural form header
+   */
+  function get_plural_forms() {
+    // lets assume message number 0 is header
+    // this is true, right?
+    $this->load_tables();
+    // cache header field for plural forms
+    if (! is_string($this->pluralheader)) {
+      if ($this->enable_cache) {
+        $header = $this->cache_translations[""];
+      } else {
+        $header = $this->get_translation_string(0);
+      }
+      if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+        $expr = $regs[1];
+      else
+        $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+      $this->pluralheader = $expr;
+    }
+    return $this->pluralheader;
+  }
+  /**
+   * Detects which plural form to take
+   *
+   * @access private
+   * @param n count
+   * @return int array index of the right plural form
+   */
+  function select_string($n) {
+    $string = $this->get_plural_forms();
+    $string = str_replace('nplurals',"\$total",$string);
+    $string = str_replace("n",$n,$string);
+    $string = str_replace('plural',"\$plural",$string);
+    # poEdit doesn't put any semicolons, which
+    # results in parse error in eval
+    $string .= ';';
+    $total = 0;
+    $plural = 0;
+    eval("$string");
+    if ($plural >= $total) $plural = $total - 1;
+    return $plural;
+  }
+  /**
+   * Plural version of gettext
+   *
+   * @access public
+   * @param string single
+   * @param string plural
+   * @param string number
+   * @return translated plural form
+   */
+  function ngettext($single, $plural, $number) {
+    if ($this->short_circuit) {
+      if ($number != 1)
+        return $plural;
+      else
+        return $single;
+    }
+    // find out the appropriate form
+    $select = $this->select_string($number);
+    // this should contains all strings separated by NULLs
+    $key = $single.chr(0).$plural;
+    if ($this->enable_cache) {
+      if (! array_key_exists($key, $this->cache_translations)) {
+        return ($number != 1) ? $plural : $single;
+      } else {
+        $result = $this->cache_translations[$key];
+        $list = explode(chr(0), $result);
+        return $list[$select];
+      }
+    } else {
+      $num = $this->find_string($key);
+      if ($num == -1) {
+        return ($number != 1) ? $plural : $single;
+      } else {
+        $result = $this->get_translation_string($num);
+        $list = explode(chr(0), $result);
+        return $list[$select];
+      }
+    }
+  }
+    //public:
+     var $error = 0; // public variable that holds error code (0 if no error)
+     //private:
+    var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+    var $STREAM = NULL;
+    var $short_circuit = false;
+    var $enable_cache = false;
+    var $originals = NULL;      // offset of original table
+    var $translations = NULL;    // offset of translation table
+    var $pluralheader = NULL;    // cache header field for plural forms
+    var $select_string_function = NULL; // cache function, which chooses plural forms
+    var $total = 0;          // total string count
+    var $table_originals = NULL;  // table for original strings (offsets)
+    var $table_translations = NULL;  // table for translated strings (offsets)
+    var $cache_translations = NULL;  // original -> translation mapping
+    /* Methods */
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @access private
+     * @return Integer from the Stream
+     */
+    function readint() {
+        if ($this->BYTEORDER == 0) {
+            // low endian
+            $low_end = unpack('V', $this->STREAM->read(4));
+            return array_shift($low_end);
+        } else {
+            // big endian
+            $big_end = unpack('N', $this->STREAM->read(4));
+            return array_shift($big_end);
+        }
+    }
+    /**
+     * Reads an array of Integers from the Stream
+     *
+     * @param int count How many elements should be read
+     * @return Array of Integers
+     */
+    function readintarray($count) {
+    if ($this->BYTEORDER == 0) {
+            // low endian
+            return unpack('V'.$count, $this->STREAM->read(4 * $count));
+        } else {
+            // big endian
+            return unpack('N'.$count, $this->STREAM->read(4 * $count));
+        }
+    }
+    /**
+     * Constructor
+     *
+     * @param object Reader the StreamReader object
+     * @param boolean enable_cache Enable or disable caching of strings (default on)
+     */
+    function gettext_reader($Reader, $enable_cache = true) {
+        // If there isn't a StreamReader, turn on short circuit mode.
+        if (! $Reader || isset($Reader->error) ) {
+            $this->short_circuit = true;
+            return;
+        }
+        // Caching can be turned off
+        $this->enable_cache = $enable_cache;
+        // $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
+        $MAGIC1 = (int) - 1794895138;
+        // $MAGIC2 = (int)0xde120495; //bug
+        $MAGIC2 = (int) - 569244523;
+        // 64-bit fix
+        $MAGIC3 = (int) 2500072158;
+        $this->STREAM = $Reader;
+        $magic = $this->readint();
+        if ($magic == ($MAGIC1 & 0xFFFFFFFF) || $magic == ($MAGIC3 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
+            $this->BYTEORDER = 0;
+        } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
+            $this->BYTEORDER = 1;
+        } else {
+            $this->error = 1; // not MO file
+            return false;
+        }
+        // FIXME: Do we care about revision? We should.
+        $revision = $this->readint();
+        $this->total = $this->readint();
+        $this->originals = $this->readint();
+        $this->translations = $this->readint();
+    }
+    /**
+     * Loads the translation tables from the MO file into the cache
+     * If caching is enabled, also loads all strings into a cache
+     * to speed up translation lookups
+     *
+     * @access private
+     */
+    function load_tables() {
+        if (is_array($this->cache_translations) &&
+            is_array($this->table_originals) &&
+            is_array($this->table_translations))
+            return;
+        /* get original and translations tables */
+        $this->STREAM->seekto($this->originals);
+        $this->table_originals = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->translations);
+        $this->table_translations = $this->readintarray($this->total * 2);
+        if ($this->enable_cache) {
+            $this->cache_translations = array ();
+            /* read all strings in the cache */
+            for ($i = 0; $i < $this->total; $i++) {
+                $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
+                $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
+                $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
+                $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
+                $this->cache_translations[$original] = $translation;
+            }
+        }
+    }
+    /**
+     * Returns a string from the "originals" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_original_string($num) {
+        $length = $this->table_originals[$num * 2 + 1];
+        $offset = $this->table_originals[$num * 2 + 2];
+        if (! $length)
+            return '';
+        $this->STREAM->seekto($offset);
+        $data = $this->STREAM->read($length);
+        return (string)$data;
+    }
+    /**
+     * Returns a string from the "translations" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_translation_string($num) {
+        $length = $this->table_translations[$num * 2 + 1];
+        $offset = $this->table_translations[$num * 2 + 2];
+        if (! $length)
+            return '';
+        $this->STREAM->seekto($offset);
+        $data = $this->STREAM->read($length);
+        return (string)$data;
+    }
+    /**
+     * Binary search for string
+     *
+     * @access private
+     * @param string string
+     * @param int start (internally used in recursive function)
+     * @param int end (internally used in recursive function)
+     * @return int string number (offset in originals table)
+     */
+    function find_string($string, $start = -1, $end = -1) {
+        if (($start == -1) or ($end == -1)) {
+            // find_string is called with only one parameter, set start end end
+            $start = 0;
+            $end = $this->total;
+        }
+        if (abs($start - $end) <= 1) {
+            // We're done, now we either found the string, or it doesn't exist
+            $txt = $this->get_original_string($start);
+            if ($string == $txt)
+                return $start;
+            else
+                return -1;
+        } else if ($start > $end) {
+            // start > end -> turn around and start over
+            return $this->find_string($string, $end, $start);
+        } else {
+            // Divide table in two parts
+            $half = (int)(($start + $end) / 2);
+            $cmp = strcmp($string, $this->get_original_string($half));
+            if ($cmp == 0)
+                // string is exactly in the middle => return it
+                return $half;
+            else if ($cmp < 0)
+                // The string is in the upper half
+                return $this->find_string($string, $start, $half);
+            else
+                // The string is in the lower half
+                return $this->find_string($string, $half, $end);
+        }
+    }
+    /**
+     * Translates a string
+     *
+     * @access public
+     * @param string string to be translated
+     * @return string translated string (or original, if not found)
+     */
+    function translate($string) {
+        if ($this->short_circuit)
+            return $string;
+        $this->load_tables();
+        if ($this->enable_cache) {
+            // Caching enabled, get translated string from cache
+            if (array_key_exists($string, $this->cache_translations))
+                return $this->cache_translations[$string];
+            else
+                return $string;
+        } else {
+            // Caching not enabled, try to find string
+            $num = $this->find_string($string);
+            if ($num == -1)
+                return $string;
+            else
+                return $this->get_translation_string($num);
+        }
+    }
+    /**
+     * Get possible plural forms from MO header
+     *
+     * @access private
+     * @return string plural form header
+     */
+    function get_plural_forms() {
+        // lets assume message number 0 is header
+        // this is true, right?
+        $this->load_tables();
+        // cache header field for plural forms
+        if (! is_string($this->pluralheader)) {
+            if ($this->enable_cache) {
+                $header = $this->cache_translations[""];
+            } else {
+                $header = $this->get_translation_string(0);
+            }
+            $header .= "\n"; //make sure our regex matches
+            if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+                $expr = $regs[1];
+            else
+                $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+            // add parentheses
+            // important since PHP's ternary evaluates from left to right
+            $expr.= ';';
+            $res= '';
+            $p= 0;
+            for ($i= 0; $i < strlen($expr); $i++) {
+                $ch= $expr[$i];
+                switch ($ch) {
+                    case '?':
+                        $res.= ' ? (';
+                        $p++;
+                        break;
+                    case ':':
+                        $res.= ') : (';
+                        break;
+                    case ';':
+                        $res.= str_repeat( ')', $p) . ';';
+                        $p= 0;
+                        break;
+                    default:
+                        $res.= $ch;
+                }
+            }
+            $this->pluralheader = $res;
+        }
+        return $this->pluralheader;
+    }
+    /**
+     * Detects which plural form to take
+     *
+     * @access private
+     * @param n count
+     * @return int array index of the right plural form
+     */
+    function select_string($n) {
+        if (is_null($this->select_string_function)) {
+            $string = $this->get_plural_forms();
+            if (preg_match("/nplurals\s*=\s*(\d+)\s*\;\s*plural\s*=\s*(.*?)\;+/", $string, $matches)) {
+                $nplurals = $matches[1];
+                $expression = $matches[2];
+                $expression = str_replace("n", '$n', $expression);
+            } else {
+                $nplurals = 2;
+                $expression = ' $n == 1 ? 0 : 1 ';
+            }
+            $func_body = "
+                \$plural = ($expression);
+                return (\$plural <= $nplurals)? \$plural : \$plural - 1;";
+            $this->select_string_function = create_function('$n', $func_body);
+        }
+        return call_user_func($this->select_string_function, $n);
+    }
+    /**
+     * Plural version of gettext
+     *
+     * @access public
+     * @param string single
+     * @param string plural
+     * @param string number
+     * @return translated plural form
+     */
+    function ngettext($single, $plural, $number) {
+        if ($this->short_circuit) {
+            if ($number != 1)
+                return $plural;
+            else
+                return $single;
+        }
+        // find out the appropriate form
+        $select = $this->select_string($number);
+        // this should contains all strings separated by NULLs
+        $key = $single.chr(0).$plural;
+        if ($this->enable_cache) {
+            if (! array_key_exists($key, $this->cache_translations)) {
+                return ($number != 1) ? $plural : $single;
+            } else {
+                $result = $this->cache_translations[$key];
+                $list = explode(chr(0), $result);
+                return $list[$select];
+            }
+        } else {
+            $num = $this->find_string($key);
+            if ($num == -1) {
+                return ($number != 1) ? $plural : $single;
+            } else {
+                $result = $this->get_translation_string($num);
+                $list = explode(chr(0), $result);
+                return $list[$select];
+            }
+        }
+    }
+}

tags/2.2/wp-includes/js/crop/cropper.js

Property svn:eol-style set to native

tags/2.2/wp-includes/js/prototype.js

Property svn:eol-style set to native

-                      r5468
+                      r5480
 /*  Prototype JavaScript framework, version 1.5.0_rc0
  *  (c) 2005 Sam Stephenson <sam@conio.net>
+/*  Prototype JavaScript framework, version 1.5.0
+ *  (c) 2005-2007 Sam Stephenson
+ *
  *  Prototype is freely distributable under the terms of an MIT-style license.
 …
 var Prototype = {
+  Version: '1.5.0_rc0',
+  Version: '1.5.0',
+  BrowserFeatures: {
+    XPath: !!document.evaluate
+  },
   ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
   emptyFunction: function() {},
   K: function(x) {return x}
+  K: function(x) { return x }
+}
 …
+}
+Object.inspect = function(object) {
+  try {
+    if (object == undefined) return 'undefined';
+    if (object == null) return 'null';
+    return object.inspect ? object.inspect() : object.toString();
+  } catch (e) {
+    if (e instanceof RangeError) return '...';
+    throw e;
+  }
+}
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (object === undefined) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : object.toString();
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+  keys: function(object) {
+    var keys = [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+  values: function(object) {
+    var values = [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+  clone: function(object) {
+    return Object.extend({}, object);
+  }
+});
 Function.prototype.bind = function() {
 …
 Function.prototype.bindAsEventListener = function(object) {
   var __method = this;
+  var __method = this, args = $A(arguments), object = args.shift();
   return function(event) {
     return __method.call(object, event || window.event);
+    return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments)));
+  }
+}
 …
     var returnValue;
     for (var i = 0; i < arguments.length; i++) {
+    for (var i = 0, length = arguments.length; i < length; i++) {
       var lambda = arguments[i];
       try {
 …
   registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
   },
 …
       try {
         this.currentlyExecuting = true;
         this.callback();
+        this.callback(this);
       } finally {
         this.currentlyExecuting = false;
 …
+  }
+}
+String.interpret = function(value){
+  return value == null ? '' : String(value);
+}
 Object.extend(String.prototype, {
   gsub: function(pattern, replacement) {
 …
       if (match = source.match(pattern)) {
         result += source.slice(0, match.index);
         result += (replacement(match) || '').toString();
+        result += String.interpret(replacement(match));
         source  = source.slice(match.index + match[0].length);
       } else {
 …
     var div = document.createElement('div');
     div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+  },
+  toQueryParams: function() {
+    var pairs = this.match(/^\??(.*)$/)[1].split('&');
+    return pairs.inject({}, function(params, pairString) {
+      var pair = pairString.split('=');
+      params[pair[0]] = pair[1];
+      return params;
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return {};
+    return match[1].split(separator || '&').inject({}, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var name = decodeURIComponent(pair[0]);
+        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
+        if (hash[name] !== undefined) {
+          if (hash[name].constructor != Array)
+            hash[name] = [hash[name]];
+          if (value) hash[name].push(value);
+        }
+        else hash[name] = value;
+      }
+      return hash;
     });
   },
 …
   },
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
   camelize: function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+    return camelizedString;
+  },
+  inspect: function() {
+    return "'" + this.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') + "'";
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+    return camelized;
+  },
+  capitalize: function(){
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+  inspect: function(useDoubleQuotes) {
+    var escapedString = this.replace(/\\/g, '\\\\');
+    if (useDoubleQuotes)
+      return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    else
+      return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  }
 });
 …
       var before = match[1];
       if (before == '\\') return match[2];
       return before + (object[match[3]] || '').toString();
+      return before + String.interpret(object[match[3]]);
     });
+  }
 …
       if (e != $break) throw e;
+    }
+    return this;
+  },
+  eachSlice: function(number, iterator) {
+    var index = -number, slices = [], array = this.toArray();
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.map(iterator);
   },
 …
   any: function(iterator) {
     var result = true;
+    var result = false;
     this.each(function(value, index) {
       if (result = !!(iterator || Prototype.K)(value, index))
 …
     var results = [];
     this.each(function(value, index) {
       results.push(iterator(value, index));
+      results.push((iterator || Prototype.K)(value, index));
     });
     return results;
   },
   detect: function (iterator) {
+  detect: function(iterator) {
     var result;
     this.each(function(value, index) {
 …
   },
+  inGroupsOf: function(number, fillWith) {
+    fillWith = fillWith === undefined ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
   inject: function(memo, iterator) {
     this.each(function(value, index) {
 …
   invoke: function(method) {
     var args = $A(arguments).slice(1);
     return this.collect(function(value) {
+    return this.map(function(value) {
       return value[method].apply(value, args);
     });
 …
   sortBy: function(iterator) {
     return this.collect(function(value, index) {
+    return this.map(function(value, index) {
       return {value: value, criteria: iterator(value, index)};
     }).sort(function(left, right) {
 …
   toArray: function() {
     return this.collect(Prototype.K);
+    return this.map();
   },
 …
       return iterator(collections.pluck(index));
     });
+  },
+  size: function() {
+    return this.toArray().length;
   },
 …
   } else {
     var results = [];
     for (var i = 0; i < iterable.length; i++)
+    for (var i = 0, length = iterable.length; i < length; i++)
       results.push(iterable[i]);
     return results;
 …
 Object.extend(Array.prototype, {
   _each: function(iterator) {
     for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       iterator(this[i]);
   },
 …
   compact: function() {
     return this.select(function(value) {
       return value != undefined || value != null;
+      return value != null;
     });
   },
 …
   indexOf: function(object) {
     for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       if (this[i] == object) return i;
     return -1;
 …
   },
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+  uniq: function() {
+    return this.inject([], function(array, value) {
+      return array.include(value) ? array : array.concat([value]);
+    });
+  },
+  clone: function() {
+    return [].concat(this);
+  },
+  size: function() {
+    return this.length;
+  },
   inspect: function() {
     return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
 });
+var Hash = {
+Array.prototype.toArray = Array.prototype.clone;
+function $w(string){
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+if(window.opera){
+  Array.prototype.concat = function(){
+    var array = [];
+    for(var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      if(arguments[i].constructor == Array) {
+        for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  }
+}
+var Hash = function(obj) {
+  Object.extend(this, obj || {});
+};
+Object.extend(Hash, {
+  toQueryString: function(obj) {
+    var parts = [];
+      this.prototype._each.call(obj, function(pair) {
+      if (!pair.key) return;
+      if (pair.value && pair.value.constructor == Array) {
+        var values = pair.value.compact();
+        if (values.length < 2) pair.value = values.reduce();
+        else {
+            key = encodeURIComponent(pair.key);
+          values.each(function(value) {
+            value = value != undefined ? encodeURIComponent(value) : '';
+            parts.push(key + '=' + encodeURIComponent(value));
+          });
+          return;
+        }
+      }
+      if (pair.value == undefined) pair[1] = '';
+      parts.push(pair.map(encodeURIComponent).join('='));
+      });
+    return parts.join('&');
+  }
+});
+Object.extend(Hash.prototype, Enumerable);
+Object.extend(Hash.prototype, {
   _each: function(iterator) {
     for (var key in this) {
       var value = this[key];
       if (typeof value == 'function') continue;
+      if (value && value == Hash.prototype[key]) continue;
       var pair = [key, value];
 …
   merge: function(hash) {
     return $H(hash).inject($H(this), function(mergedHash, pair) {
+    return $H(hash).inject(this, function(mergedHash, pair) {
       mergedHash[pair.key] = pair.value;
       return mergedHash;
 …
   },
+  remove: function() {
+    var result;
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      var value = this[arguments[i]];
+      if (value !== undefined){
+        if (result === undefined) result = value;
+        else {
+          if (result.constructor != Array) result = [result];
+          result.push(value)
+        }
+      }
+      delete this[arguments[i]];
+    }
+    return result;
+  },
   toQueryString: function() {
+    return this.map(function(pair) {
+      return pair.map(encodeURIComponent).join('=');
+    }).join('&');
+    return Hash.toQueryString(this);
   },
 …
     }).join(', ') + '}>';
+  }
+}
+});
 function $H(object) {
+  var hash = Object.extend({}, object || {});
+  Object.extend(hash, Enumerable);
+  Object.extend(hash, Hash);
+  return hash;
+}
+  if (object && object.constructor == Hash) return object;
+  return new Hash(object);
+};
 ObjectRange = Class.create();
 Object.extend(ObjectRange.prototype, Enumerable);
 …
   _each: function(iterator) {
     var value = this.start;
     do {
+    while (this.include(value)) {
       iterator(value);
       value = value.succ();
     } while (this.include(value));
+    }
   },
 …
   },
   register: function(responderToAdd) {
     if (!this.include(responderToAdd))
       this.responders.push(responderToAdd);
   },
   unregister: function(responderToRemove) {
     this.responders = this.responders.without(responderToRemove);
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
   },
   dispatch: function(callback, request, transport, json) {
     this.each(function(responder) {
       if (responder[callback] && typeof responder[callback] == 'function') {
+      if (typeof responder[callback] == 'function') {
         try {
           responder[callback].apply(responder, [request, transport, json]);
 …
     Ajax.activeRequestCount++;
   },
   onComplete: function() {
     Ajax.activeRequestCount--;
 …
       asynchronous: true,
       contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
       parameters:   ''
+    }
     Object.extend(this.options, options || {});
+  },
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+    this.options.method = this.options.method.toLowerCase();
+    if (typeof this.options.parameters == 'string')
+      this.options.parameters = this.options.parameters.toQueryParams();
+  }
+}
 …
 Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  _complete: false,
   initialize: function(url, options) {
     this.transport = Ajax.getTransport();
 …
   request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+    this.url = url;
+    this.method = this.options.method;
+    var params = this.options.parameters;
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
+    }
+    params = Hash.toQueryString(params);
+    if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
+    // when GET, append parameters to URL
+    if (this.method == 'get' && params)
+      this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params;
     try {
-      this.url = url;
-      if (this.options.method == 'get' && parameters.length > 0)
-        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
       Ajax.Responders.dispatch('onCreate', this, this.transport);
       this.transport.open(this.options.method, this.url,
+      this.transport.open(this.method.toUpperCase(), this.url,
         this.options.asynchronous);
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      if (this.options.asynchronous)
+        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+      var body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(body);
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+      if (typeof extras.push == 'function')
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+  success: function() {
+    return !this.transport.status
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+      this.setRequestHeaders();
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+      if ((this.getHeader('Content-type') || 'text/javascript').strip().
+        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
+          this.evalResponse();
+    }
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + state, this, transport, json);
     } catch (e) {
       this.dispatchException(e);
+    }
+  },
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', Prototype.Version,
+       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type', this.options.contentType);
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+  header: function(name) {
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+  getHeader: function(name) {
     try {
       return this.transport.getResponseHeader(name);
     } catch (e) {}
+    } catch (e) { return null }
   },
   evalJSON: function() {
     try {
+      return eval('(' + this.header('X-JSON') + ')');
+    } catch (e) {}
+      var json = this.getHeader('X-JSON');
+      return json ? eval('(' + json + ')') : null;
+    } catch (e) { return null }
   },
 …
   },
-  respondToReadyState: function(readyState) {
-    var event = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
-    if (event == 'Complete') {
-      try {
-        (this.options['on' + this.transport.status]
-         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
+      }
-      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
-        this.evalResponse();
+    }
-    try {
-      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + event, this, transport, json);
-    } catch (e) {
-      this.dispatchException(e);
+    }
-    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
-    if (event == 'Complete')
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-  },
   dispatchException: function(exception) {
     (this.options.onException || Prototype.emptyFunction)(this, exception);
 …
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
   initialize: function(container, url, options) {
+    this.containers = {
+      success: container.success ? $(container.success) : $(container),
+      failure: container.failure ? $(container.failure) :
+        (container.success ? null : $(container))
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    }
 …
     var onComplete = this.options.onComplete || Prototype.emptyFunction;
     this.options.onComplete = (function(transport, object) {
+    this.options.onComplete = (function(transport, param) {
       this.updateContent();
       onComplete(transport, object);
+      onComplete(transport, param);
     }).bind(this);
 …
   updateContent: function() {
+    var receiver = this.responseIsSuccess() ?
+      this.containers.success : this.containers.failure;
+    var receiver = this.container[this.success() ? 'success' : 'failure'];
     var response = this.transport.responseText;
+    if (!this.options.evalScripts)
+      response = response.stripScripts();
+    if (receiver) {
+      if (this.options.insertion) {
+    if (!this.options.evalScripts) response = response.stripScripts();
+    if (receiver = $(receiver)) {
+      if (this.options.insertion)
         new this.options.insertion(receiver, response);
+      } else {
+        Element.update(receiver, response);
+      }
+    }
+    if (this.responseIsSuccess()) {
+      else
+        receiver.update(response);
+    }
+    if (this.success()) {
       if (this.onComplete)
         setTimeout(this.onComplete.bind(this), 10);
 …
   stop: function() {
     this.updater.onComplete = undefined;
+    this.updater.options.onComplete = undefined;
     clearTimeout(this.timer);
     (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
 …
+  }
 });
+function $() {
+  var results = [], element;
+  for (var i = 0; i < arguments.length; i++) {
+    element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+    results.push(Element.extend(element));
+  }
+  return results.length < 2 ? results[0] : results;
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (typeof element == 'string')
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(query.snapshotItem(i));
+    return results;
+  };
+}
 document.getElementsByClassName = function(className, parentElement) {
+  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  return $A(children).inject([], function(elements, child) {
+    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      elements.push(Element.extend(child));
+  if (Prototype.BrowserFeatures.XPath) {
+    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
+    return document._getElementsByXPath(q, parentElement);
+  } else {
+    var children = ($(parentElement) || document.body).getElementsByTagName('*');
+    var elements = [], child;
+    for (var i = 0, length = children.length; i < length; i++) {
+      child = children[i];
+      if (Element.hasClassName(child, className))
+        elements.push(Element.extend(child));
+    }
     return elements;
   });
+}
+  }
+};
 /*--------------------------------------------------------------------------*/
 …
 Element.extend = function(element) {
+  if (!element) return;
+  if (_nativeExtensions) return element;
+  if (!element || _nativeExtensions || element.nodeType == 3) return element;
   if (!element._extended && element.tagName && element != window) {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+    var methods = Object.clone(Element.Methods), cache = Element.extend.cache;
+    if (element.tagName == 'FORM')
+      Object.extend(methods, Form.Methods);
+    if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName))
+      Object.extend(methods, Form.Element.Methods);
+    Object.extend(methods, Element.Methods.Simulated);
+    for (var property in methods) {
       var value = methods[property];
       if (typeof value == 'function')
+      if (typeof value == 'function' && !(property in element))
         element[property] = cache.findOrStore(value);
+    }
 …
   element._extended = true;
   return element;
+}
+};
 Element.extend.cache = {
 …
+    }
+  }
+}
+};
 Element.Methods = {
 …
   },
+  toggle: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      Element[Element.visible(element) ? 'hide' : 'show'](element);
+    }
+  },
+  hide: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = 'none';
+    }
+  },
+  show: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = '';
+    }
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+  hide: function(element) {
+    $(element).style.display = 'none';
+    return element;
+  },
+  show: function(element) {
+    $(element).style.display = '';
+    return element;
   },
 …
     element = $(element);
     element.parentNode.removeChild(element);
+    return element;
   },
   update: function(element, html) {
+    html = typeof html == 'undefined' ? '' : html.toString();
     $(element).innerHTML = html.stripScripts();
     setTimeout(function() {html.evalScripts()}, 10);
+    return element;
   },
   replace: function(element, html) {
     element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
     if (element.outerHTML) {
       element.outerHTML = html.stripScripts();
 …
+    }
     setTimeout(function() {html.evalScripts()}, 10);
+    return element;
+  },
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+  descendants: function(element) {
+    return $A($(element).getElementsByTagName('*'));
+  },
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+  siblings: function(element) {
+    element = $(element);
+    return element.previousSiblings().reverse().concat(element.nextSiblings());
+  },
+  match: function(element, selector) {
+    if (typeof selector == 'string')
+      selector = new Selector(selector);
+    return selector.match($(element));
+  },
+  up: function(element, expression, index) {
+    return Selector.findElement($(element).ancestors(), expression, index);
+  },
+  down: function(element, expression, index) {
+    return Selector.findElement($(element).descendants(), expression, index);
+  },
+  previous: function(element, expression, index) {
+    return Selector.findElement($(element).previousSiblings(), expression, index);
+  },
+  next: function(element, expression, index) {
+    return Selector.findElement($(element).nextSiblings(), expression, index);
+  },
+  getElementsBySelector: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+  getElementsByClassName: function(element, className) {
+    return document.getElementsByClassName(className, element);
+  },
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (document.all && !window.opera) {
+      var t = Element._attributeTranslations;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name])  name = t.names[name];
+      var attribute = element.attributes[name];
+      if(attribute) return attribute.nodeValue;
+    }
+    return element.getAttribute(name);
   },
   getHeight: function(element) {
+    element = $(element);
+    return element.offsetHeight;
+    return $(element).getDimensions().height;
+  },
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
   },
 …
   hasClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).include(className);
+    var elementClassName = element.className;
+    if (elementClassName.length == 0) return false;
+    if (elementClassName == className ||
+        elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      return true;
+    return false;
   },
   addClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).add(className);
+    Element.classNames(element).add(className);
+    return element;
   },
   removeClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).remove(className);
+    Element.classNames(element).remove(className);
+    return element;
+  },
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
+    return element;
+  },
+  observe: function() {
+    Event.observe.apply(Event, arguments);
+    return $A(arguments).first();
+  },
+  stopObserving: function() {
+    Event.stopObserving.apply(Event, arguments);
+    return $A(arguments).first();
   },
 …
   cleanWhitespace: function(element) {
     element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
       if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        Element.remove(node);
+    }
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
   },
 …
   },
   childOf: function(element, ancestor) {
+  descendantOf: function(element, ancestor) {
     element = $(element), ancestor = $(ancestor);
     while (element = element.parentNode)
 …
   scrollTo: function(element) {
     element = $(element);
     var x = element.x ? element.x : element.offsetLeft,
         y = element.y ? element.y : element.offsetTop;
     window.scrollTo(x, y);
+    var pos = Position.cumulativeOffset(element);
+    window.scrollTo(pos[0], pos[1]);
+    return element;
   },
   getStyle: function(element, style) {
     element = $(element);
+    var value = element.style[style.camelize()];
+    if (['float','cssFloat'].include(style))
+      style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat');
+    style = style.camelize();
+    var value = element.style[style];
     if (!value) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
         var css = document.defaultView.getComputedStyle(element, null);
         value = css ? css.getPropertyValue(style) : null;
+        value = css ? css[style] : null;
       } else if (element.currentStyle) {
         value = element.currentStyle[style.camelize()];
+        value = element.currentStyle[style];
+      }
+    }
+    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
+      value = element['offset'+style.capitalize()] + 'px';
     if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
       if (Element.getStyle(element, 'position') == 'static') value = 'auto';
+    if(style == 'opacity') {
+      if(value) return parseFloat(value);
+      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if(value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
     return value == 'auto' ? null : value;
   },
 …
   setStyle: function(element, style) {
     element = $(element);
+    for (var name in style)
+      element.style[name.camelize()] = style[name];
+    for (var name in style) {
+      var value = style[name];
+      if(name == 'opacity') {
+        if (value == 1) {
+          value = (/Gecko/.test(navigator.userAgent) &&
+            !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else if(value == '') {
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else {
+          if(value < 0.00001) value = 0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
+              'alpha(opacity='+value*100+')';
+        }
+      } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
+      element.style[name.camelize()] = value;
+    }
+    return element;
   },
   getDimensions: function(element) {
     element = $(element);
+    if (Element.getStyle(element, 'display') != 'none')
+    var display = $(element).getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
       return {width: element.offsetWidth, height: element.offsetHeight};
 …
     var originalVisibility = els.visibility;
     var originalPosition = els.position;
+    var originalDisplay = els.display;
     els.visibility = 'hidden';
     els.position = 'absolute';
     els.display = '';
+    els.display = 'block';
     var originalWidth = element.clientWidth;
     var originalHeight = element.clientHeight;
     els.display = 'none';
+    els.display = originalDisplay;
     els.position = originalPosition;
     els.visibility = originalVisibility;
 …
+      }
+    }
+    return element;
   },
 …
         element.style.right = '';
+    }
+    return element;
   },
   makeClipping: function(element) {
     element = $(element);
     if (element._overflow) return;
     element._overflow = element.style.overflow;
+    if (element._overflow) return element;
+    element._overflow = element.style.overflow || 'auto';
     if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
       element.style.overflow = 'hidden';
+    return element;
   },
   undoClipping: function(element) {
     element = $(element);
+    if (element._overflow) return;
+    element.style.overflow = element._overflow;
+    element._overflow = undefined;
+  }
+}
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  }
+};
+Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
+Element._attributeTranslations = {};
+Element._attributeTranslations.names = {
+  colspan:   "colSpan",
+  rowspan:   "rowSpan",
+  valign:    "vAlign",
+  datetime:  "dateTime",
+  accesskey: "accessKey",
+  tabindex:  "tabIndex",
+  enctype:   "encType",
+  maxlength: "maxLength",
+  readonly:  "readOnly",
+  longdesc:  "longDesc"
+};
+Element._attributeTranslations.values = {
+  _getAttr: function(element, attribute) {
+    return element.getAttribute(attribute, 2);
+  },
+  _flag: function(element, attribute) {
+    return $(element).hasAttribute(attribute) ? attribute : null;
+  },
+  style: function(element) {
+    return element.style.cssText.toLowerCase();
+  },
+  title: function(element) {
+    var node = element.getAttributeNode('title');
+    return node.specified ? node.nodeValue : null;
+  }
+};
+Object.extend(Element._attributeTranslations.values, {
+  href: Element._attributeTranslations.values._getAttr,
+  src:  Element._attributeTranslations.values._getAttr,
+  disabled: Element._attributeTranslations.values._flag,
+  checked:  Element._attributeTranslations.values._flag,
+  readonly: Element._attributeTranslations.values._flag,
+  multiple: Element._attributeTranslations.values._flag
+});
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    var t = Element._attributeTranslations;
+    attribute = t.names[attribute] || attribute;
+    return $(element).getAttributeNode(attribute).specified;
+  }
+};
+// IE is missing .innerHTML support for TABLE-related elements
+if (document.all && !window.opera){
+  Element.Methods.update = function(element, html) {
+    element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
+    var tagName = element.tagName.toUpperCase();
+    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
+      var div = document.createElement('div');
+      switch (tagName) {
+        case 'THEAD':
+        case 'TBODY':
+          div.innerHTML = '<table><tbody>' +  html.stripScripts() + '</tbody></table>';
+          depth = 2;
+          break;
+        case 'TR':
+          div.innerHTML = '<table><tbody><tr>' +  html.stripScripts() + '</tr></tbody></table>';
+          depth = 3;
+          break;
+        case 'TD':
+          div.innerHTML = '<table><tbody><tr><td>' +  html.stripScripts() + '</td></tr></tbody></table>';
+          depth = 4;
+      }
+      $A(element.childNodes).each(function(node){
+        element.removeChild(node)
+      });
+      depth.times(function(){ div = div.firstChild });
+      $A(div.childNodes).each(
+        function(node){ element.appendChild(node) });
+    } else {
+      element.innerHTML = html.stripScripts();
+    }
+    setTimeout(function() {html.evalScripts()}, 10);
+    return element;
+  }
+};
 Object.extend(Element, Element.Methods);
 …
 var _nativeExtensions = false;
+if(!HTMLElement && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  var HTMLElement = {}
+  HTMLElement.prototype = document.createElement('div').__proto__;
+}
+if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+  ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) {
+    var className = 'HTML' + tag + 'Element';
+    if(window[className]) return;
+    var klass = window[className] = {};
+    klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__;
+  });
 Element.addMethods = function(methods) {
   Object.extend(Element.Methods, methods || {});
+  if(typeof HTMLElement != 'undefined') {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    var cache = Element.extend.cache;
+    for (var property in methods) {
       var value = methods[property];
+      if (typeof value == 'function')
+        HTMLElement.prototype[property] = cache.findOrStore(value);
+    }
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = cache.findOrStore(value);
+    }
+  }
+  if (typeof HTMLElement != 'undefined') {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+    copy(Form.Methods, HTMLFormElement.prototype);
+    [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) {
+      copy(Form.Element.Methods, klass.prototype);
+    });
     _nativeExtensions = true;
+  }
+}
-Element.addMethods();
 var Toggle = new Object();
 …
         this.element.insertAdjacentHTML(this.adjacency, this.content);
       } catch (e) {
         var tagName = this.element.tagName.toLowerCase();
         if (tagName == 'tbody' || tagName == 'tr') {
+        var tagName = this.element.tagName.toUpperCase();
+        if (['TBODY', 'TR'].include(tagName)) {
           this.insertContent(this.contentFromAnonymousTable());
         } else {
 …
   add: function(classNameToAdd) {
     if (this.include(classNameToAdd)) return;
     this.set(this.toArray().concat(classNameToAdd).join(' '));
+    this.set($A(this).concat(classNameToAdd).join(' '));
   },
   remove: function(classNameToRemove) {
     if (!this.include(classNameToRemove)) return;
+    this.set(this.select(function(className) {
+      return className != classNameToRemove;
+    }).join(' '));
+    this.set($A(this).without(classNameToRemove).join(' '));
   },
   toString: function() {
     return this.toArray().join(' ');
+  }
+}
+    return $A(this).join(' ');
+  }
+};
 Object.extend(Element.ClassNames.prototype, Enumerable);
 …
       conditions.push('true');
     if (clause = params.id)
       conditions.push('element.id == ' + clause.inspect());
+      conditions.push('element.readAttribute("id") == ' + clause.inspect());
     if (clause = params.tagName)
       conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
     if ((clause = params.classNames).length > 0)
       for (var i = 0; i < clause.length; i++)
         conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+      for (var i = 0, length = clause.length; i < length; i++)
+        conditions.push('element.hasClassName(' + clause[i].inspect() + ')');
     if (clause = params.attributes) {
       clause.each(function(attribute) {
         var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var value = 'element.readAttribute(' + attribute.name.inspect() + ')';
         var splitValueBy = function(delimiter) {
           return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
 …
           case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
           case '':
           case undefined: conditions.push(value + ' != null'); break;
+          case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break;
           default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
+        }
 …
   compileMatcher: function() {
     this.match = new Function('element', 'if (!element.tagName) return false; \
+      element = $(element); \
       return ' + this.buildMatchExpression());
   },
 …
     var results = [];
     for (var i = 0; i < scope.length; i++)
+    for (var i = 0, length = scope.length; i < length; i++)
       if (this.match(element = scope[i]))
         results.push(Element.extend(element));
 …
+}
+Object.extend(Selector, {
+  matchElements: function(elements, expression) {
+    var selector = new Selector(expression);
+    return elements.select(selector.match.bind(selector)).map(Element.extend);
+  },
+  findElement: function(elements, expression, index) {
+    if (typeof expression == 'number') index = expression, expression = false;
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+  findChildElements: function(element, expressions) {
+    return expressions.map(function(expression) {
+      return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) {
+        var selector = new Selector(expr);
+        return results.inject([], function(elements, result) {
+          return elements.concat(selector.findElements(result || element));
+        });
+      });
+    }).flatten();
+  }
+});
 function $$() {
+  return $A(arguments).map(function(expression) {
+    return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      var selector = new Selector(expr);
+      return results.map(selector.findElements.bind(selector)).flatten();
+    });
+  }).flatten();
+}
+var Field = {
+  clear: function() {
+    for (var i = 0; i < arguments.length; i++)
+      $(arguments[i]).value = '';
+  },
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+  serializeElements: function(elements, getHash) {
+    var data = elements.inject({}, function(result, element) {
+      if (!element.disabled && element.name) {
+        var key = element.name, value = $(element).getValue();
+        if (value != undefined) {
+          if (result[key]) {
+            if (result[key].constructor != Array) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+    return getHash ? data : Hash.toQueryString(data);
+  }
+};
+Form.Methods = {
+  serialize: function(form, getHash) {
+    return Form.serializeElements(Form.getElements(form), getHash);
+  },
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+    return matchingInputs;
+  },
+  disable: function(form) {
+    form = $(form);
+    form.getElements().each(function(element) {
+      element.blur();
+      element.disabled = 'true';
+    });
+    return form;
+  },
+  enable: function(form) {
+    form = $(form);
+    form.getElements().each(function(element) {
+      element.disabled = '';
+    });
+    return form;
+  },
+  findFirstElement: function(form) {
+    return $(form).getElements().find(function(element) {
+      return element.type != 'hidden' && !element.disabled &&
+        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  }
+}
+Object.extend(Form, Form.Methods);
+/*--------------------------------------------------------------------------*/
+Form.Element = {
   focus: function(element) {
     $(element).focus();
+  },
+  present: function() {
+    for (var i = 0; i < arguments.length; i++)
+      if ($(arguments[i]).value == '') return false;
+    return true;
+    return element;
   },
   select: function(element) {
     $(element).select();
+    return element;
+  }
+}
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = {};
+        pair[element.name] = value;
+        return Hash.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+  present: function(element) {
+    return $(element).value != '';
   },
 …
     element = $(element);
     element.focus();
+    if (element.select)
+    if (element.select && ( element.tagName.toLowerCase() != 'input' ||
+      !['button', 'reset', 'submit'].include(element.type) ) )
       element.select();
+  }
+}
+    return element;
+  },
+  disable: function(element) {
+    element = $(element);
+    element.disabled = true;
+    return element;
+  },
+  enable: function(element) {
+    element = $(element);
+    element.blur();
+    element.disabled = false;
+    return element;
+  }
+}
+Object.extend(Form.Element, Form.Element.Methods);
+var Field = Form.Element;
+var $F = Form.Element.getValue;
 /*--------------------------------------------------------------------------*/
-var Form = {
-  serialize: function(form) {
-    var elements = Form.getElements($(form));
-    var queryComponents = new Array();
-    for (var i = 0; i < elements.length; i++) {
-      var queryComponent = Form.Element.serialize(elements[i]);
-      if (queryComponent)
-        queryComponents.push(queryComponent);
+    }
-    return queryComponents.join('&');
-  },
-  getElements: function(form) {
-    form = $(form);
-    var elements = new Array();
-    for (var tagName in Form.Element.Serializers) {
-      var tagElements = form.getElementsByTagName(tagName);
-      for (var j = 0; j < tagElements.length; j++)
-        elements.push(tagElements[j]);
+    }
-    return elements;
-  },
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-    if (!typeName && !name)
-      return inputs;
-    var matchingInputs = new Array();
-    for (var i = 0; i < inputs.length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) ||
-          (name && input.name != name))
-        continue;
-      matchingInputs.push(input);
+    }
-    return matchingInputs;
-  },
-  disable: function(form) {
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
-      element.blur();
-      element.disabled = 'true';
+    }
-  },
-  enable: function(form) {
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
-      element.disabled = '';
+    }
-  },
-  findFirstElement: function(form) {
-    return Form.getElements(form).find(function(element) {
-      return element.type != 'hidden' && !element.disabled &&
-        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-  focusFirstElement: function(form) {
-    Field.activate(Form.findFirstElement(form));
-  },
-  reset: function(form) {
-    $(form).reset();
+  }
+}
-Form.Element = {
-  serialize: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-    if (parameter) {
-      var key = encodeURIComponent(parameter[0]);
-      if (key.length == 0) return;
-      if (parameter[1].constructor != Array)
-        parameter[1] = [parameter[1]];
-      return parameter[1].map(function(value) {
-        return key + '=' + encodeURIComponent(value);
-      }).join('&');
+    }
-  },
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-    if (parameter)
-      return parameter[1];
+  }
+}
 Form.Element.Serializers = {
   input: function(element) {
     switch (element.type.toLowerCase()) {
-      case 'submit':
-      case 'hidden':
-      case 'password':
-      case 'text':
-        return Form.Element.Serializers.textarea(element);
       case 'checkbox':
       case 'radio':
         return Form.Element.Serializers.inputSelector(element);
+    }
+    return false;
+      default:
+        return Form.Element.Serializers.textarea(element);
+    }
   },
   inputSelector: function(element) {
+    if (element.checked)
+      return [element.name, element.value];
+    return element.checked ? element.value : null;
   },
   textarea: function(element) {
     return [element.name, element.value];
+    return element.value;
   },
   select: function(element) {
     return Form.Element.Serializers[element.type == 'select-one' ?
+    return this[element.type == 'select-one' ?
       'selectOne' : 'selectMany'](element);
   },
   selectOne: function(element) {
+    var value = '', opt, index = element.selectedIndex;
+    if (index >= 0) {
+      opt = element.options[index];
+      value = opt.value || opt.text;
+    }
+    return [element.name, value];
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
   },
   selectMany: function(element) {
+    var value = [];
+    for (var i = 0; i < element.length; i++) {
+    var values, length = element.length;
+    if (!length) return null;
+    for (var i = 0, values = []; i < length; i++) {
       var opt = element.options[i];
       if (opt.selected)
         value.push(opt.value || opt.text);
+    }
     return [element.name, value];
+  }
+}
+/*--------------------------------------------------------------------------*/
+var $F = Form.Element.getValue;
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+}
 /*--------------------------------------------------------------------------*/
 …
   onTimerEvent: function() {
     var value = this.getValue();
+    if (this.lastValue != value) {
+    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
+      ? this.lastValue != value : String(this.lastValue) != String(value));
+    if (changed) {
       this.callback(this.element, value);
       this.lastValue = value;
 …
   registerFormCallbacks: function() {
+    var elements = Form.getElements(this.element);
+    for (var i = 0; i < elements.length; i++)
+      this.registerCallback(elements[i]);
+    Form.getElements(this.element).each(this.registerCallback.bind(this));
   },
 …
           Event.observe(element, 'click', this.onElementEvent.bind(this));
           break;
+        case 'password':
+        case 'text':
+        case 'textarea':
+        case 'select-one':
+        case 'select-multiple':
+        default:
           Event.observe(element, 'change', this.onElementEvent.bind(this));
           break;
 …
   KEY_DOWN:     40,
   KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
   element: function(event) {
 …
   unloadCache: function() {
     if (!Event.observers) return;
     for (var i = 0; i < Event.observers.length; i++) {
+    for (var i = 0, length = Event.observers.length; i < length; i++) {
       Event.stopObserving.apply(this, Event.observers[i]);
       Event.observers[i][0] = null;
 …
   observe: function(element, name, observer, useCapture) {
     var element = $(element);
+    element = $(element);
     useCapture = useCapture || false;
 …
       name = 'keydown';
     this._observeAndCache(element, name, observer, useCapture);
+    Event._observeAndCache(element, name, observer, useCapture);
   },
   stopObserving: function(element, name, observer, useCapture) {
     var element = $(element);
+    element = $(element);
     useCapture = useCapture || false;
 …
       element = element.offsetParent;
       if (element) {
+        p = Element.getStyle(element, 'position');
+        if(element.tagName=='BODY') break;
+        var p = Element.getStyle(element, 'position');
         if (p == 'relative' || p == 'absolute') break;
+      }
 …
   },
-  clone: function(source, target) {
-    source = $(source);
-    target = $(target);
-    target.style.position = 'absolute';
-    var offsets = this.cumulativeOffset(source);
-    target.style.top    = offsets[1] + 'px';
-    target.style.left   = offsets[0] + 'px';
-    target.style.width  = source.offsetWidth + 'px';
-    target.style.height = source.offsetHeight + 'px';
-  },
   page: function(forElement) {
     var valueT = 0, valueL = 0;
 …
     element = forElement;
     do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+      if (!window.opera || element.tagName=='BODY') {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
     } while (element = element.parentNode);
 …
     element.style.position = 'absolute';
     element.style.top    = top + 'px';;
     element.style.left   = left + 'px';;
     element.style.width  = width + 'px';;
     element.style.height = height + 'px';;
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
   },
 …
+  }
+}
+Element.addMethods();

tags/2.2/wp-includes/js/quicktags.js

-                      r5468
+                      r5480
 function edShowLinks() {
     var tempStr = '<select onchange="edQuickLink(this.options[this.selectedIndex].value, this);"><option value="-1" selected>(Quick Links)</option>';
+    var tempStr = '<select onchange="edQuickLink(this.options[this.selectedIndex].value, this);"><option value="-1" selected>' + quicktagsL10n.quickLinks + '</option>';
     for (i = 0; i < edLinks.length; i++) {
         tempStr += '<option value="' + i + '">' + edLinks[i].display + '</option>';
 …
+    }
     if (word == '') {
         word = prompt('Enter a word to look up:', '');
+        word = prompt(quicktagsL10n.wordLookup, '');
+    }
     if (word !== null && /^\w[\w ]*$/.test(word)) {
 …
         edShowButton(edButtons[i], i);
+    }
     document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="Dictionary lookup" value="lookup" />');
     document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="Close all open tags" value="Close Tags" />');
+    document.write('<input type="button" id="ed_spell" class="ed_button" onclick="edSpell(edCanvas);" title="' + quicktagsL10n.dictionaryLookup + '" value="' + quicktagsL10n.lookup + '" />');
+    document.write('<input type="button" id="ed_close" class="ed_button" onclick="edCloseAllTags();" title="' + quicktagsL10n.closeAllOpenTags + '" value="' + quicktagsL10n.closeTags + '" />');
 //  edShowLinks(); // disabled by default
     document.write('</div>');
 …
+    }
     if (!edCheckOpenTags(i)) {
         var URL = prompt('Enter the URL' ,defaultValue);
+        var URL = prompt(quicktagsL10n.enterURL, defaultValue);
         if (URL) {
             edButtons[i].tagStart = '<a href="' + URL + '">';
 …
 function edInsertImage(myField) {
     var myValue = prompt('Enter the URL of the image', 'http://');
+    var myValue = prompt(quicktagsL10n.enterImageURL, 'http://');
     if (myValue) {
         myValue = '<img src="'
                 + myValue
                 + '" alt="' + prompt('Enter a description of the image', '')
+                + '" alt="' + prompt(quicktagsL10n.enterImageDescription, '')
                 + '" />';
         edInsertContent(myField, myValue);

tags/2.2/wp-includes/js/scriptaculous/MIT-LICENSE

r5468	r5480
1		Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
	1	Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
2	2
3	3	Permission is hereby granted, free of charge, to any person obtaining

tags/2.2/wp-includes/js/scriptaculous/builder.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// script.aculo.us builder.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //
+// See scriptaculous.js for full license.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 var Builder = {
 …
     // see if browser added wrapping tags
     if(element && (element.tagName != elementName))
+    if(element && (element.tagName.toUpperCase() != elementName))
       element = element.getElementsByTagName(elementName)[0];
 …
                 element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
             if(element.tagName != elementName)
+            if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
+            }
 …
      return document.createTextNode(text);
   },
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
   _attributes: function(attributes) {
     var attrs = [];
     for(attribute in attributes)
       attrs.push((attribute=='className' ? 'class' : attribute) +
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
           '="' + attributes[attribute].toString().escapeHTML() + '"');
     return attrs.join(" ");
 …
   _isStringOrNumber: function(param) {
     return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      }
+    });
+  }
+}

tags/2.2/wp-includes/js/scriptaculous/controls.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005 Jon Tirsen (http://www.tirsen.com)
+// script.aculo.us controls.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
 // Contributors:
 //  Richard Livsey
 …
 //  Rob Wills
 //
+// See scriptaculous.js for full license.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 // Autocompleter.Base handles all the autocompletion functionality
 …
 // useful when one of the tokens is \n (a newline), as it
 // allows smart autocompletion after linebreaks.
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
 var Autocompleter = {}
 …
     this.entryCount  = 0;
     if (this.setOptions)
+    if(this.setOptions)
       this.setOptions(options);
     else
 …
     this.options.minChars     = this.options.minChars || 1;
     this.options.onShow       = this.options.onShow ||
+    function(element, update){
+      if(!update.style.position || update.style.position=='absolute') {
+        update.style.position = 'absolute';
+        Position.clone(element, update, {setHeight: false, offsetTop: element.offsetHeight});
+      }
+      Effect.Appear(update,{duration:0.15});
+    };
+      function(element, update){
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false,
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
     this.options.onHide = this.options.onHide ||
     function(element, update){ new Effect.Fade(update,{duration:0.15}) };
     if (typeof(this.options.tokens) == 'string')
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+    if(typeof(this.options.tokens) == 'string')
       this.options.tokens = new Array(this.options.tokens);
 …
   fixIEOverlapping: function() {
     Position.clone(this.update, this.iefix);
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
     this.iefix.style.zIndex = 1;
     this.update.style.zIndex = 2;
 …
     if(this.index > 0) this.index--
       else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
   },
 …
     if(this.index < this.entryCount-1) this.index++
       else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
   },
 …
       this.update.innerHTML = choices;
       Element.cleanWhitespace(this.update);
       Element.cleanWhitespace(this.update.firstChild);
       if(this.update.firstChild && this.update.firstChild.childNodes) {
+      Element.cleanWhitespace(this.update.down());
+      if(this.update.firstChild && this.update.down().childNodes) {
         this.entryCount =
           this.update.firstChild.childNodes.length;
+          this.update.down().childNodes.length;
         for (var i = 0; i < this.entryCount; i++) {
           var entry = this.getEntry(i);
 …
       this.stopIndicator();
       this.index = 0;
+      this.render();
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
   },
 …
     this.options = Object.extend({
+      paramName: "value",
       okButton: true,
       okText: "ok",
 …
     this.createForm();
     this.element.parentNode.insertBefore(this.form, this.element);
     Field.scrollFreeActivate(this.editField);
+    if (!this.options.loadTextURL) Field.scrollFreeActivate(this.editField);
     // stop the event to avoid a page refresh in Safari
     if (evt) {
 …
       textField.obj = this;
       textField.type = "text";
       textField.name = "value";
+      textField.name = this.options.paramName;
       textField.value = text;
       textField.style.backgroundColor = this.options.highlightcolor;
 …
       var textArea = document.createElement("textarea");
       textArea.obj = this;
       textArea.name = "value";
+      textArea.name = this.options.paramName;
       textArea.value = this.convertHTMLLineBreaks(text);
       textArea.rows = this.options.rows;
 …
     this.editField.disabled = false;
     this.editField.value = transport.responseText.stripTags();
+    Field.scrollFreeActivate(this.editField);
   },
   onclickCancel: function() {
 …
         optionTag = document.createElement("option");
         optionTag.value = (e instanceof Array) ? e[0] : e;
+        if((typeof this.options.value == 'undefined') &&
+          ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true;
         if(this.options.value==optionTag.value) optionTag.selected = true;
         optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));

tags/2.2/wp-includes/js/scriptaculous/dragdrop.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+// script.aculo.us dragdrop.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
 //
+// See scriptaculous.js for full license.
+/*--------------------------------------------------------------------------*/
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+if(typeof Effect == 'undefined')
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
 var Droppables = {
 …
   activate: function(draggable) {
+    window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+    this.activeDraggable = draggable;
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
   },
 …
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;
     this.activeDraggable.updateDrag(event, pointer);
   },
   endDrag: function(event) {
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+    }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
 …
         if(o[eventName]) o[eventName](eventName, draggable, event);
       });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },
 …
 var Draggable = Class.create();
+Draggable._dragging    = {};
 Draggable.prototype = {
   initialize: function(element) {
     var options = Object.extend({
+    var defaults = {
       handle: false,
-      starteffect: function(element) {
-        element._opacity = Element.getOpacity(element);
-        new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
-      },
       reverteffect: function(element, top_offset, left_offset) {
         var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        element._revert = new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur});
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
       },
       endeffect: function(element) {
+        var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity});
+        var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){
+            Draggable._dragging[element] = false
+          }
+        });
       },
       zindex: 1000,
 …
       scrollSensitivity: 20,
       scrollSpeed: 15,
+      snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
+    }, arguments[1] || {});
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+    if(!arguments[1] || typeof arguments[1].endeffect == 'undefined')
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+        }
+      });
+    var options = Object.extend(defaults, arguments[1] || {});
     this.element = $(element);
+    if(options.handle && (typeof options.handle == 'string')) {
+      var h = Element.childrenWithClassName(this.element, options.handle, true);
+      if(h.length>0) this.handle = h[0];
+    }
+    if(options.handle && (typeof options.handle == 'string'))
+      this.handle = this.element.down('.'+options.handle, 0);
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
     Element.makePositioned(this.element); // fix IE
 …
   initDrag: function(event) {
+    if(typeof Draggable._dragging[this.element] != 'undefined' &&
+      Draggable._dragging[this.element]) return;
     if(Event.isLeftClick(event)) {
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
       if(src.tagName && (
         src.tagName=='INPUT' ||
         src.tagName=='SELECT' ||
         src.tagName=='OPTION' ||
         src.tagName=='BUTTON' ||
         src.tagName=='TEXTAREA')) return;
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
-      if(this.element._revert) {
-        this.element._revert.cancel();
-        this.element._revert = null;
+      }
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
 …
     Draggables.notify('onStart', this, event);
     if(this.options.starteffect) this.options.starteffect(this.element);
   },
 …
     Droppables.show(pointer, this.element);
     Draggables.notify('onDrag', this, event);
     this.draw(pointer);
     if(this.options.change) this.options.change(this);
 …
       } else {
         p = Position.page(this.options.scroll);
         p[0] += this.options.scroll.scrollLeft;
         p[1] += this.options.scroll.scrollTop;
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
         p.push(p[0]+this.options.scroll.offsetWidth);
         p.push(p[1]+this.options.scroll.offsetHeight);
 …
     if(this.options.endeffect)
       this.options.endeffect(this.element);
     Draggables.deactivate(this);
     Droppables.reset();
 …
   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];
     if(this.options.scroll && (this.options.scroll != window)) {
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
 …
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";
     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },
 …
   startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
 …
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);
+    Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+    Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+    Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+    if (Draggables._lastScrollPointer[0] < 0)
+      Draggables._lastScrollPointer[0] = 0;
+    if (Draggables._lastScrollPointer[1] < 0)
+      Draggables._lastScrollPointer[1] = 0;
+    this.draw(Draggables._lastScrollPointer);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
     if(this.options.change) this.options.change(this);
 …
 var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
   sortables: {},
   _findRootElement: function(element) {
     while (element.tagName != "BODY") {
+    while (element.tagName.toUpperCase() != "BODY") {
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
 …
       handle:      false,      // or a CSS class
       only:        false,
+      delay:       0,
       hoverclass:  null,
       ghosting:    false,
 …
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      /^[^_]*_(.*)$/,
+      format:      this.SERIALIZE_RULE,
       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
 …
       scrollSpeed: options.scrollSpeed,
       scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
       ghosting:    options.ghosting,
       constraint:  options.constraint,
 …
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover
-      //greedy:      !options.dropOnEmpty
+    }
 …
       // handles are per-draggable
       var handle = options.handle ?
         Element.childrenWithClassName(e, options.handle)[0] : e;
+        $(e).down('.'+options.handle,0) : e;
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
 …
       var index;
       var children = Sortable.findElements(dropon, {tag: droponOptions.tag});
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;
 …
   unmark: function() {
     if(Sortable._marker) Element.hide(Sortable._marker);
+    if(Sortable._marker) Sortable._marker.hide();
   },
 …
     if(!Sortable._marker) {
+      Sortable._marker = $('dropmarker') || document.createElement('DIV');
+      Element.hide(Sortable._marker);
+      Element.addClassName(Sortable._marker, 'dropmarker');
+      Sortable._marker.style.position = 'absolute';
+      Sortable._marker =
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }
     var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.style.left = offsets[0] + 'px';
+    Sortable._marker.style.top = offsets[1] + 'px';
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
     if(position=='after')
       if(sortable.overlap == 'horizontal')
         Sortable._marker.style.left = (offsets[0]+dropon.clientWidth) + 'px';
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
         Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';
     Element.show(Sortable._marker);
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+    Sortable._marker.show();
   },
 …
         element: element,
         parent: parent,
         children: new Array,
+        children: [],
         position: parent.children.length,
         container: Sortable._findChildrenElement(children[i], options.treeTag.toUpperCase())
+        container: $(children[i]).down(options.treeTag)
+      }
 …
     return parent;
-  },
-  /* Finds the first element of the given tag type within a parent element.
-    Used for finding the first LI[ST] within a L[IST]I[TEM].*/
-  _findChildrenElement: function (element, containerTag) {
-    if (element && element.hasChildNodes)
-      for (var i = 0; i < element.childNodes.length; ++i)
-        if (element.childNodes[i].tagName == containerTag)
-          return element.childNodes[i];
-    return null;
   },
 …
       id: null,
       parent: null,
       children: new Array,
+      children: [],
       container: element,
       position: 0
+    }
     return Sortable._tree (element, options, root);
+    return Sortable._tree(element, options, root);
   },
 …
     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {
         return [name + Sortable._constructIndex(item) + "=" +
+        return [name + Sortable._constructIndex(item) + "[id]=" +
                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
 …
+}
 /* Returns true if child is contained within element */
+// Returns true if child is contained within element
 Element.isParent = function(child, element) {
   if (!child.parentNode || child == element) return false;
   if (child.parentNode == element) return true;
   return Element.isParent(child.parentNode, element);
+}
 …
 Element.offsetSize = function (element, type) {
+  if (type == 'vertical' || type == 'height')
+    return element.offsetHeight;
+  else
+    return element.offsetWidth;
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+}

tags/2.2/wp-includes/js/scriptaculous/effects.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// script.aculo.us effects.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // Contributors:
 //  Justin Palmer (http://encytemedia.com/)
 …
 //  Martin Bialasinki
 //
+// See scriptaculous.js for full license.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 // converts rgb() and #xxx to #xxxxxx format,
 // returns self (or first argument) if not convertable
 String.prototype.parseColor = function() {
   var color = '#';
+  var color = '#';
   if(this.slice(0,4) == 'rgb(') {
     var cols = this.slice(4,this.length-1).split(',');
 …
 Element.setContentZoom = function(element, percent) {
   element = $(element);
   Element.setStyle(element, {fontSize: (percent/100) + 'em'});
+  element.setStyle({fontSize: (percent/100) + 'em'});
   if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+}
+Element.getOpacity = function(element){
+  var opacity;
+  if (opacity = Element.getStyle(element, 'opacity'))
+    return parseFloat(opacity);
+  if (opacity = (Element.getStyle(element, 'filter') || '').match(/alpha\(opacity=(.*)\)/))
+    if(opacity[1]) return parseFloat(opacity[1]) / 100;
+  return 1.0;
+}
+Element.setOpacity = function(element, value){
+  element= $(element);
+  if (value == 1){
+    Element.setStyle(element, { opacity:
+      (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ?
+.999999 : null });
+    if(/MSIE/.test(navigator.userAgent))
+      Element.setStyle(element, {filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});
+  } else {
+    if(value < 0.00001) value = 0;
+    Element.setStyle(element, {opacity: value});
+    if(/MSIE/.test(navigator.userAgent))
+     Element.setStyle(element,
+       { filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'') +
+                 'alpha(opacity='+value*100+')' });
+  }
+}
+Element.getInlineOpacity = function(element){
+  return element;
+}
+Element.getOpacity = function(element){
+  return $(element).getStyle('opacity');
+}
+Element.setOpacity = function(element, value){
+  return $(element).setStyle({opacity:value});
+}
+Element.getInlineOpacity = function(element){
   return $(element).style.opacity || '';
+}
-Element.childrenWithClassName = function(element, className, findFirst) {
-  var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)");
-  var results = $A($(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) {
-    return (c.className && c.className.match(classNameRegExp));
-  });
-  if(!results) results = [];
-  return results;
+}
 …
 var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
   tagifyText: function(element) {
+    if(typeof Builder == 'undefined')
+      throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
     var tagifyStyle = 'position:relative';
+    if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
+    if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1';
     element = $(element);
     $A(element.childNodes).each( function(child) {
 …
 /* ------------- transitions ------------- */
+Effect.Transitions = {}
+Effect.Transitions.linear = function(pos) {
+  return pos;
+}
+Effect.Transitions.sinoidal = function(pos) {
+  return (-Math.cos(pos*Math.PI)/2) + 0.5;
+}
+Effect.Transitions.reverse  = function(pos) {
+  return 1-pos;
+}
+Effect.Transitions.flicker = function(pos) {
+  return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+}
+Effect.Transitions.wobble = function(pos) {
+  return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+}
+Effect.Transitions.pulse = function(pos) {
+  return (Math.floor(pos*10) % 2 == 0 ?
+    (pos*10-Math.floor(pos*10)) : 1-(pos*10-Math.floor(pos*10)));
+}
+Effect.Transitions.none = function(pos) {
+  return 0;
+}
+Effect.Transitions.full = function(pos) {
+  return 1;
+}
+Effect.Transitions = {
+  linear: Prototype.K,
+  sinoidal: function(pos) {
+    return (-Math.cos(pos*Math.PI)/2) + 0.5;
+  },
+  reverse: function(pos) {
+    return 1-pos;
+  },
+  flicker: function(pos) {
+    return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+  },
+  wobble: function(pos) {
+    return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+  },
+  pulse: function(pos, pulses) {
+    pulses = pulses || 5;
+    return (
+      Math.round((pos % (1/pulses)) * pulses) == 0 ?
+            ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) :
+- ((pos * pulses * 2) - Math.floor(pos * pulses * 2))
+      );
+  },
+  none: function(pos) {
+    return 0;
+  },
+  full: function(pos) {
+    return 1;
+  }
+};
 /* ------------- core effects ------------- */
 …
           });
         break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
       case 'end':
         // start effect after last queued effect has finished
 …
     if(!this.interval)
       this.interval = setInterval(this.loop.bind(this), 40);
+      this.interval = setInterval(this.loop.bind(this), 15);
   },
   remove: function(effect) {
 …
   loop: function() {
     var timePos = new Date().getTime();
+    this.effects.invoke('loop', timePos);
+    for(var i=0, len=this.effects.length;i<len;i++)
+      if(this.effects[i]) this.effects[i].loop(timePos);
+  }
 });
 …
   transition: Effect.Transitions.sinoidal,
   duration:   1.0,   // seconds
   fps:        25.0,  // max. 25fps due to Effect.Queue implementation
+  fps:        60.0,  // max. 60fps due to Effect.Queue implementation
   sync:       false, // true for combining
   from:       0.0,
 …
   },
   inspect: function() {
+    return '#<Effect:' + $H(this).inspect() + ',options:' + $H(this.options).inspect() + '>';
+    var data = $H();
+    for(property in this)
+      if(typeof this[property] != 'function') data[property] = this[property];
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
+  }
+}
 …
 });
+Effect.Event = Class.create();
+Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), {
+  initialize: function() {
+    var options = Object.extend({
+      duration: 0
+    }, arguments[0] || {});
+    this.start(options);
+  },
+  update: Prototype.emptyFunction
+});
 Effect.Opacity = Class.create();
 Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
   initialize: function(element) {
     this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
     // make this work on IE on elements without 'layout'
     if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
+    if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout))
       this.element.setStyle({zoom: 1});
     var options = Object.extend({
 …
   initialize: function(element) {
     this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({
       x:    0,
 …
   update: function(position) {
     this.element.setStyle({
       left: this.options.x  * position + this.originalLeft + 'px',
       top:  this.options.y  * position + this.originalTop  + 'px'
+      left: Math.round(this.options.x  * position + this.originalLeft) + 'px',
+      top:  Math.round(this.options.y  * position + this.originalTop)  + 'px'
     });
+  }
 …
 Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
   initialize: function(element, percent) {
+    this.element = $(element)
+    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({
       scaleX: true,
 …
     var fontSize = this.element.getStyle('font-size') || '100%';
     ['em','px','%'].each( function(fontSizeType) {
+    ['em','px','%','pt'].each( function(fontSizeType) {
       if(fontSize.indexOf(fontSizeType)>0) {
         this.fontSize     = parseFloat(fontSize);
 …
   },
   finish: function(position) {
     if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+    if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
   },
   setDimensions: function(height, width) {
     var d = {};
     if(this.options.scaleX) d.width = width + 'px';
     if(this.options.scaleY) d.height = height + 'px';
+    if(this.options.scaleX) d.width = Math.round(width) + 'px';
+    if(this.options.scaleY) d.height = Math.round(height) + 'px';
     if(this.options.scaleFromCenter) {
       var topd  = (height - this.dims[0])/2;
 …
   initialize: function(element) {
     this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
     this.start(options);
 …
     if(this.element.getStyle('display')=='none') { this.cancel(); return; }
     // Disable background image during the effect
+    this.oldStyle = {
+      backgroundImage: this.element.getStyle('background-image') };
+    this.element.setStyle({backgroundImage: 'none'});
+    this.oldStyle = {};
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
     if(!this.options.endcolor)
       this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
 …
   afterFinishInternal: function(effect) {
     if(effect.options.to!=0) return;
+    effect.element.hide();
+    effect.element.setStyle({opacity: oldOpacity});
+    effect.element.hide().setStyle({opacity: oldOpacity});
   }}, arguments[1] || {});
   return new Effect.Opacity(element,options);
 …
   },
   beforeSetup: function(effect) {
+    effect.element.setOpacity(effect.options.from);
+    effect.element.show();
+    effect.element.setOpacity(effect.options.from).show();
   }}, arguments[1] || {});
   return new Effect.Opacity(element,options);
 …
 Effect.Puff = function(element) {
   element = $(element);
+  var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') };
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
+    position: element.getStyle('position'),
+    top:  element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height
+  };
   return new Effect.Parallel(
    [ new Effect.Scale(element, 200,
 …
      Object.extend({ duration: 1.0,
       beforeSetupInternal: function(effect) {
+        effect.effects[0].element.setStyle({position: 'absolute'}); },
+        Position.absolutize(effect.effects[0].element)
+      },
       afterFinishInternal: function(effect) {
+         effect.effects[0].element.hide();
+         effect.effects[0].element.setStyle(oldStyle); }
+         effect.effects[0].element.hide().setStyle(oldStyle); }
      }, arguments[1] || {})
    );
 …
   element = $(element);
   element.makeClipping();
   return new Effect.Scale(element, 0,
+  return new Effect.Scale(element, 0,
     Object.extend({ scaleContent: false,
       scaleX: false,
       restoreAfterFinish: true,
       afterFinishInternal: function(effect) {
+        effect.element.hide();
+        effect.element.undoClipping();
+        effect.element.hide().undoClipping();
+      }
     }, arguments[1] || {})
 …
   element = $(element);
   var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100,
+    Object.extend({ scaleContent: false,
+      scaleX: false,
+      scaleFrom: 0,
+      scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+      restoreAfterFinish: true,
+      afterSetup: function(effect) {
+        effect.element.makeClipping();
+        effect.element.setStyle({height: '0px'});
+        effect.element.show();
+      },
+      afterFinishInternal: function(effect) {
+        effect.element.undoClipping();
+      }
+    }, arguments[1] || {})
+  );
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: 0,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+    }
+  }, arguments[1] || {}));
+}
 …
   element = $(element);
   var oldOpacity = element.getInlineOpacity();
   return new Effect.Appear(element, {
+  return new Effect.Appear(element, Object.extend({
     duration: 0.4,
     from: 0,
 …
         scaleX: false, scaleContent: false, restoreAfterFinish: true,
         beforeSetup: function(effect) {
+          effect.element.makePositioned();
+          effect.element.makeClipping();
+          effect.element.makePositioned().makeClipping();
         },
         afterFinishInternal: function(effect) {
+          effect.element.hide();
+          effect.element.undoClipping();
+          effect.element.undoPositioned();
+          effect.element.setStyle({opacity: oldOpacity});
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
+        }
       })
+    }
   });
+  }, arguments[1] || {}));
+}
 …
         },
         afterFinishInternal: function(effect) {
+          effect.effects[0].element.hide();
+          effect.effects[0].element.undoPositioned();
+          effect.effects[0].element.setStyle(oldStyle);
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
+        }
       }, arguments[1] || {}));
 …
     new Effect.Move(effect.element,
       { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
+        effect.element.undoPositioned();
+        effect.element.setStyle(oldStyle);
+        effect.element.undoPositioned().setStyle(oldStyle);
   }}) }}) }}) }}) }}) }});
+}
 Effect.SlideDown = function(element) {
+  element = $(element);
+  element.cleanWhitespace();
+  element = $(element).cleanWhitespace();
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
   var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, Object.extend({
 …
     afterSetup: function(effect) {
       effect.element.makePositioned();
       effect.element.firstChild.makePositioned();
+      effect.element.down().makePositioned();
       if(window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping();
+      effect.element.setStyle({height: '0px'});
+      effect.element.show(); },
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
     afterUpdateInternal: function(effect) {
       effect.element.firstChild.setStyle({bottom:
+      effect.element.down().setStyle({bottom:
         (effect.dims[0] - effect.element.clientHeight) + 'px' });
     },
     afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+      // IE will crash if child is undoPositioned first
+      if(/MSIE/.test(navigator.userAgent)){
+        effect.element.undoPositioned();
+        effect.element.firstChild.undoPositioned();
+      }else{
+        effect.element.firstChild.undoPositioned();
+        effect.element.undoPositioned();
+      }
+      effect.element.firstChild.setStyle({bottom: oldInnerBottom}); }
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
     }, arguments[1] || {})
   );
+}
 Effect.SlideUp = function(element) {
+  element = $(element);
+  element.cleanWhitespace();
+  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
   return new Effect.Scale(element, window.opera ? 0 : 1,
    Object.extend({ scaleContent: false,
 …
     beforeStartInternal: function(effect) {
       effect.element.makePositioned();
       effect.element.firstChild.makePositioned();
+      effect.element.down().makePositioned();
       if(window.opera) effect.element.setStyle({top: ''});
       effect.element.makeClipping();
       effect.element.show(); },
+      effect.element.makeClipping().show();
+    },
     afterUpdateInternal: function(effect) {
+      effect.element.firstChild.setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' }); },
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
     afterFinishInternal: function(effect) {
+      effect.element.hide();
+      effect.element.undoClipping();
+      effect.element.firstChild.undoPositioned();
+      effect.element.undoPositioned();
+      effect.element.setStyle({bottom: oldInnerBottom}); }
+      effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom});
+      effect.element.down().undoPositioned();
+    }
    }, arguments[1] || {})
   );
 …
 // Bug in opera makes the TD containing this element expand for a instance after finish
 Effect.Squish = function(element) {
+  return new Effect.Scale(element, window.opera ? 1 : 0,
+    { restoreAfterFinish: true,
+      beforeSetup: function(effect) {
+        effect.element.makeClipping(effect.element); },
+      afterFinishInternal: function(effect) {
+        effect.element.hide(effect.element);
+        effect.element.undoClipping(effect.element); }
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping();
+    }
   });
+}
 …
     duration: 0.01,
     beforeSetup: function(effect) {
+      effect.element.hide();
+      effect.element.makeClipping();
+      effect.element.makePositioned();
+      effect.element.hide().makeClipping().makePositioned();
     },
     afterFinishInternal: function(effect) {
 …
         ], Object.extend({
              beforeSetup: function(effect) {
+               effect.effects[0].element.setStyle({height: '0px'});
+               effect.effects[0].element.show();
+               effect.effects[0].element.setStyle({height: '0px'}).show();
              },
              afterFinishInternal: function(effect) {
+               effect.effects[0].element.undoClipping();
+               effect.effects[0].element.undoPositioned();
+               effect.effects[0].element.setStyle(oldStyle);
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+             }
            }, options)
 …
     ], Object.extend({
          beforeStartInternal: function(effect) {
            effect.effects[0].element.makePositioned();
            effect.effects[0].element.makeClipping(); },
+           effect.effects[0].element.makePositioned().makeClipping();
+         },
          afterFinishInternal: function(effect) {
+           effect.effects[0].element.hide();
+           effect.effects[0].element.undoClipping();
+           effect.effects[0].element.undoPositioned();
+           effect.effects[0].element.setStyle(oldStyle); }
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
        }, options)
   );
 …
   var oldOpacity = element.getInlineOpacity();
   var transition = options.transition || Effect.Transitions.sinoidal;
   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos)) };
+  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
   reverser.bind(transition);
   return new Effect.Opacity(element,
     Object.extend(Object.extend({  duration: 3.0, from: 0,
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
       afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
     }, options), {transition: reverser}));
 …
     width: element.style.width,
     height: element.style.height };
   Element.makeClipping(element);
+  element.makeClipping();
   return new Effect.Scale(element, 5, Object.extend({
     scaleContent: false,
 …
       scaleY: false,
       afterFinishInternal: function(effect) {
+        effect.element.hide();
+        effect.element.undoClipping();
+        effect.element.setStyle(oldStyle);
+        effect.element.hide().undoClipping().setStyle(oldStyle);
       } });
   }}, arguments[1] || {}));
 };
+Effect.Morph = Class.create();
+Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
+  initialize: function(element) {
+    this.element = $(element);
+    if(!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: {}
+    }, arguments[1] || {});
+    if (typeof options.style == 'string') {
+      if(options.style.indexOf(':') == -1) {
+        var cssText = '', selector = '.' + options.style;
+        $A(document.styleSheets).reverse().each(function(styleSheet) {
+          if (styleSheet.cssRules) cssRules = styleSheet.cssRules;
+          else if (styleSheet.rules) cssRules = styleSheet.rules;
+          $A(cssRules).reverse().each(function(rule) {
+            if (selector == rule.selectorText) {
+              cssText = rule.style.cssText;
+              throw $break;
+            }
+          });
+          if (cssText) throw $break;
+        });
+        this.style = cssText.parseStyle();
+        options.afterFinishInternal = function(effect){
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            if(transform.style != 'opacity')
+              effect.element.style[transform.style.camelize()] = '';
+          });
+        }
+      } else this.style = options.style.parseStyle();
+    } else this.style = $H(options.style)
+    this.start(options);
+  },
+  setup: function(){
+    function parseColor(color){
+      if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 )
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0].underscore().dasherize(), value = pair[1], unit = null;
+      if(value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if(property == 'opacity') {
+        value = parseFloat(value);
+        if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if(Element.CSS_LENGTH.test(value))
+        var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/),
+          value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null;
+      var originalValue = this.element.getStyle(property);
+      return $H({
+        style: property,
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      });
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      )
+    });
+  },
+  update: function(position) {
+    var style = $H(), value = null;
+    this.transforms.each(function(transform){
+      value = transform.unit=='color' ?
+        $R(0,2).inject('#',function(m,v,i){
+          return m+(Math.round(transform.originalValue[i]+
+            (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) :
+        transform.originalValue + Math.round(
+          ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit;
+      style[transform.style] = value;
+    });
+    this.element.setStyle(style);
+  }
+});
+Effect.Transform = Class.create();
+Object.extend(Effect.Transform.prototype, {
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || {};
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      var data = $H(track).values().first();
+      this.tracks.push($H({
+        ids:     $H(track).keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var elements = [$(track.ids) || $$(track.ids)].flatten();
+        return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+String.prototype.parseStyle = function(){
+  var element = Element.extend(document.createElement('div'));
+  element.innerHTML = '<div style="' + this + '"></div>';
+  var style = element.down().style, styleRules = $H();
+  Element.CSS_PROPERTIES.each(function(property){
+    if(style[property]) styleRules[property] = style[property];
+  });
+  if(/MSIE/.test(navigator.userAgent) && !window.opera && this.indexOf('opacity') > -1) {
+    styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1];
+  }
+  return styleRules;
+};
+Element.morph = function(element, style) {
+  new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {}));
+  return element;
+};
 ['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom',
  'collectTextNodes','collectTextNodesIgnoreClass','childrenWithClassName'].each(
+ 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each(
   function(f) { Element.Methods[f] = Element[f]; }
 );

tags/2.2/wp-includes/js/scriptaculous/prototype.js

-                      r5468
+                      r5480
 /*  Prototype JavaScript framework, version 1.5.0_rc0
  *  (c) 2005 Sam Stephenson <sam@conio.net>
+/*  Prototype JavaScript framework, version 1.5.0
+ *  (c) 2005-2007 Sam Stephenson
+ *
  *  Prototype is freely distributable under the terms of an MIT-style license.
 …
 var Prototype = {
+  Version: '1.5.0_rc0',
+  Version: '1.5.0',
+  BrowserFeatures: {
+    XPath: !!document.evaluate
+  },
   ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
   emptyFunction: function() {},
   K: function(x) {return x}
+  K: function(x) { return x }
+}
 …
+}
+Object.inspect = function(object) {
+  try {
+    if (object == undefined) return 'undefined';
+    if (object == null) return 'null';
+    return object.inspect ? object.inspect() : object.toString();
+  } catch (e) {
+    if (e instanceof RangeError) return '...';
+    throw e;
+  }
+}
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (object === undefined) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : object.toString();
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+  keys: function(object) {
+    var keys = [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+  values: function(object) {
+    var values = [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+  clone: function(object) {
+    return Object.extend({}, object);
+  }
+});
 Function.prototype.bind = function() {
 …
 Function.prototype.bindAsEventListener = function(object) {
   var __method = this;
+  var __method = this, args = $A(arguments), object = args.shift();
   return function(event) {
     return __method.call(object, event || window.event);
+    return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments)));
+  }
+}
 …
     var returnValue;
     for (var i = 0; i < arguments.length; i++) {
+    for (var i = 0, length = arguments.length; i < length; i++) {
       var lambda = arguments[i];
       try {
 …
   registerCallback: function() {
+    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
   },
 …
       try {
         this.currentlyExecuting = true;
         this.callback();
+        this.callback(this);
       } finally {
         this.currentlyExecuting = false;
 …
+  }
+}
+String.interpret = function(value){
+  return value == null ? '' : String(value);
+}
 Object.extend(String.prototype, {
   gsub: function(pattern, replacement) {
 …
       if (match = source.match(pattern)) {
         result += source.slice(0, match.index);
         result += (replacement(match) || '').toString();
+        result += String.interpret(replacement(match));
         source  = source.slice(match.index + match[0].length);
       } else {
 …
     var div = document.createElement('div');
     div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
+  },
+  toQueryParams: function() {
+    var pairs = this.match(/^\??(.*)$/)[1].split('&');
+    return pairs.inject({}, function(params, pairString) {
+      var pair = pairString.split('=');
+      params[pair[0]] = pair[1];
+      return params;
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return {};
+    return match[1].split(separator || '&').inject({}, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var name = decodeURIComponent(pair[0]);
+        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
+        if (hash[name] !== undefined) {
+          if (hash[name].constructor != Array)
+            hash[name] = [hash[name]];
+          if (value) hash[name].push(value);
+        }
+        else hash[name] = value;
+      }
+      return hash;
     });
   },
 …
   },
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
   camelize: function() {
+    var oStringList = this.split('-');
+    if (oStringList.length == 1) return oStringList[0];
+    var camelizedString = this.indexOf('-') == 0
+      ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
+      : oStringList[0];
+    for (var i = 1, len = oStringList.length; i < len; i++) {
+      var s = oStringList[i];
+      camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
+    }
+    return camelizedString;
+  },
+  inspect: function() {
+    return "'" + this.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') + "'";
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+    return camelized;
+  },
+  capitalize: function(){
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+  inspect: function(useDoubleQuotes) {
+    var escapedString = this.replace(/\\/g, '\\\\');
+    if (useDoubleQuotes)
+      return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    else
+      return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  }
 });
 …
       var before = match[1];
       if (before == '\\') return match[2];
       return before + (object[match[3]] || '').toString();
+      return before + String.interpret(object[match[3]]);
     });
+  }
 …
       if (e != $break) throw e;
+    }
+    return this;
+  },
+  eachSlice: function(number, iterator) {
+    var index = -number, slices = [], array = this.toArray();
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.map(iterator);
   },
 …
   any: function(iterator) {
     var result = true;
+    var result = false;
     this.each(function(value, index) {
       if (result = !!(iterator || Prototype.K)(value, index))
 …
     var results = [];
     this.each(function(value, index) {
       results.push(iterator(value, index));
+      results.push((iterator || Prototype.K)(value, index));
     });
     return results;
   },
   detect: function (iterator) {
+  detect: function(iterator) {
     var result;
     this.each(function(value, index) {
 …
   },
+  inGroupsOf: function(number, fillWith) {
+    fillWith = fillWith === undefined ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
   inject: function(memo, iterator) {
     this.each(function(value, index) {
 …
   invoke: function(method) {
     var args = $A(arguments).slice(1);
     return this.collect(function(value) {
+    return this.map(function(value) {
       return value[method].apply(value, args);
     });
 …
   sortBy: function(iterator) {
     return this.collect(function(value, index) {
+    return this.map(function(value, index) {
       return {value: value, criteria: iterator(value, index)};
     }).sort(function(left, right) {
 …
   toArray: function() {
     return this.collect(Prototype.K);
+    return this.map();
   },
 …
       return iterator(collections.pluck(index));
     });
+  },
+  size: function() {
+    return this.toArray().length;
   },
 …
   } else {
     var results = [];
     for (var i = 0; i < iterable.length; i++)
+    for (var i = 0, length = iterable.length; i < length; i++)
       results.push(iterable[i]);
     return results;
 …
 Object.extend(Array.prototype, {
   _each: function(iterator) {
     for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       iterator(this[i]);
   },
 …
   compact: function() {
     return this.select(function(value) {
       return value != undefined || value != null;
+      return value != null;
     });
   },
 …
   indexOf: function(object) {
     for (var i = 0; i < this.length; i++)
+    for (var i = 0, length = this.length; i < length; i++)
       if (this[i] == object) return i;
     return -1;
 …
   },
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+  uniq: function() {
+    return this.inject([], function(array, value) {
+      return array.include(value) ? array : array.concat([value]);
+    });
+  },
+  clone: function() {
+    return [].concat(this);
+  },
+  size: function() {
+    return this.length;
+  },
   inspect: function() {
     return '[' + this.map(Object.inspect).join(', ') + ']';
+  }
 });
+var Hash = {
+Array.prototype.toArray = Array.prototype.clone;
+function $w(string){
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+if(window.opera){
+  Array.prototype.concat = function(){
+    var array = [];
+    for(var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      if(arguments[i].constructor == Array) {
+        for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  }
+}
+var Hash = function(obj) {
+  Object.extend(this, obj || {});
+};
+Object.extend(Hash, {
+  toQueryString: function(obj) {
+    var parts = [];
+      this.prototype._each.call(obj, function(pair) {
+      if (!pair.key) return;
+      if (pair.value && pair.value.constructor == Array) {
+        var values = pair.value.compact();
+        if (values.length < 2) pair.value = values.reduce();
+        else {
+            key = encodeURIComponent(pair.key);
+          values.each(function(value) {
+            value = value != undefined ? encodeURIComponent(value) : '';
+            parts.push(key + '=' + encodeURIComponent(value));
+          });
+          return;
+        }
+      }
+      if (pair.value == undefined) pair[1] = '';
+      parts.push(pair.map(encodeURIComponent).join('='));
+      });
+    return parts.join('&');
+  }
+});
+Object.extend(Hash.prototype, Enumerable);
+Object.extend(Hash.prototype, {
   _each: function(iterator) {
     for (var key in this) {
       var value = this[key];
       if (typeof value == 'function') continue;
+      if (value && value == Hash.prototype[key]) continue;
       var pair = [key, value];
 …
   merge: function(hash) {
     return $H(hash).inject($H(this), function(mergedHash, pair) {
+    return $H(hash).inject(this, function(mergedHash, pair) {
       mergedHash[pair.key] = pair.value;
       return mergedHash;
 …
   },
+  remove: function() {
+    var result;
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      var value = this[arguments[i]];
+      if (value !== undefined){
+        if (result === undefined) result = value;
+        else {
+          if (result.constructor != Array) result = [result];
+          result.push(value)
+        }
+      }
+      delete this[arguments[i]];
+    }
+    return result;
+  },
   toQueryString: function() {
+    return this.map(function(pair) {
+      return pair.map(encodeURIComponent).join('=');
+    }).join('&');
+    return Hash.toQueryString(this);
   },
 …
     }).join(', ') + '}>';
+  }
+}
+});
 function $H(object) {
+  var hash = Object.extend({}, object || {});
+  Object.extend(hash, Enumerable);
+  Object.extend(hash, Hash);
+  return hash;
+}
+  if (object && object.constructor == Hash) return object;
+  return new Hash(object);
+};
 ObjectRange = Class.create();
 Object.extend(ObjectRange.prototype, Enumerable);
 …
   _each: function(iterator) {
     var value = this.start;
     do {
+    while (this.include(value)) {
       iterator(value);
       value = value.succ();
     } while (this.include(value));
+    }
   },
 …
   },
   register: function(responderToAdd) {
     if (!this.include(responderToAdd))
       this.responders.push(responderToAdd);
   },
   unregister: function(responderToRemove) {
     this.responders = this.responders.without(responderToRemove);
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
   },
   dispatch: function(callback, request, transport, json) {
     this.each(function(responder) {
       if (responder[callback] && typeof responder[callback] == 'function') {
+      if (typeof responder[callback] == 'function') {
         try {
           responder[callback].apply(responder, [request, transport, json]);
 …
     Ajax.activeRequestCount++;
   },
   onComplete: function() {
     Ajax.activeRequestCount--;
 …
       asynchronous: true,
       contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
       parameters:   ''
+    }
     Object.extend(this.options, options || {});
+  },
+  responseIsSuccess: function() {
+    return this.transport.status == undefined
+        || this.transport.status == 0
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+  responseIsFailure: function() {
+    return !this.responseIsSuccess();
+    this.options.method = this.options.method.toLowerCase();
+    if (typeof this.options.parameters == 'string')
+      this.options.parameters = this.options.parameters.toQueryParams();
+  }
+}
 …
 Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+  _complete: false,
   initialize: function(url, options) {
     this.transport = Ajax.getTransport();
 …
   request: function(url) {
+    var parameters = this.options.parameters || '';
+    if (parameters.length > 0) parameters += '&_=';
+    this.url = url;
+    this.method = this.options.method;
+    var params = this.options.parameters;
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
+    }
+    params = Hash.toQueryString(params);
+    if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
+    // when GET, append parameters to URL
+    if (this.method == 'get' && params)
+      this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params;
     try {
-      this.url = url;
-      if (this.options.method == 'get' && parameters.length > 0)
-        this.url += (this.url.match(/\?/) ? '&' : '?') + parameters;
       Ajax.Responders.dispatch('onCreate', this, this.transport);
       this.transport.open(this.options.method, this.url,
+      this.transport.open(this.method.toUpperCase(), this.url,
         this.options.asynchronous);
+      if (this.options.asynchronous) {
+        this.transport.onreadystatechange = this.onStateChange.bind(this);
+        setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10);
+      if (this.options.asynchronous)
+        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+      var body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(body);
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+      if (typeof extras.push == 'function')
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+  success: function() {
+    return !this.transport.status
+        || (this.transport.status >= 200 && this.transport.status < 300);
+  },
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState];
+    var transport = this.transport, json = this.evalJSON();
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + this.transport.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(transport, json);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+      this.setRequestHeaders();
+      var body = this.options.postBody ? this.options.postBody : parameters;
+      this.transport.send(this.options.method == 'post' ? body : null);
+      if ((this.getHeader('Content-type') || 'text/javascript').strip().
+        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
+          this.evalResponse();
+    }
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
+      Ajax.Responders.dispatch('on' + state, this, transport, json);
     } catch (e) {
       this.dispatchException(e);
+    }
+  },
+  setRequestHeaders: function() {
+    var requestHeaders =
+      ['X-Requested-With', 'XMLHttpRequest',
+       'X-Prototype-Version', Prototype.Version,
+       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
+    if (this.options.method == 'post') {
+      requestHeaders.push('Content-type', this.options.contentType);
+      /* Force "Connection: close" for Mozilla browsers to work around
+       * a bug where XMLHttpReqeuest sends an incorrect Content-length
+       * header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType)
+        requestHeaders.push('Connection', 'close');
+    }
+    if (this.options.requestHeaders)
+      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
+    for (var i = 0; i < requestHeaders.length; i += 2)
+      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
+  },
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState != 1)
+      this.respondToReadyState(this.transport.readyState);
+  },
+  header: function(name) {
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+  getHeader: function(name) {
     try {
       return this.transport.getResponseHeader(name);
     } catch (e) {}
+    } catch (e) { return null }
   },
   evalJSON: function() {
     try {
+      return eval('(' + this.header('X-JSON') + ')');
+    } catch (e) {}
+      var json = this.getHeader('X-JSON');
+      return json ? eval('(' + json + ')') : null;
+    } catch (e) { return null }
   },
 …
   },
-  respondToReadyState: function(readyState) {
-    var event = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
-    if (event == 'Complete') {
-      try {
-        (this.options['on' + this.transport.status]
-         || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
+      }
-      if ((this.header('Content-type') || '').match(/^text\/javascript/i))
-        this.evalResponse();
+    }
-    try {
-      (this.options['on' + event] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + event, this, transport, json);
-    } catch (e) {
-      this.dispatchException(e);
+    }
-    /* Avoid memory leak in MSIE: clean up the oncomplete event handler */
-    if (event == 'Complete')
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-  },
   dispatchException: function(exception) {
     (this.options.onException || Prototype.emptyFunction)(this, exception);
 …
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
   initialize: function(container, url, options) {
+    this.containers = {
+      success: container.success ? $(container.success) : $(container),
+      failure: container.failure ? $(container.failure) :
+        (container.success ? null : $(container))
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    }
 …
     var onComplete = this.options.onComplete || Prototype.emptyFunction;
     this.options.onComplete = (function(transport, object) {
+    this.options.onComplete = (function(transport, param) {
       this.updateContent();
       onComplete(transport, object);
+      onComplete(transport, param);
     }).bind(this);
 …
   updateContent: function() {
+    var receiver = this.responseIsSuccess() ?
+      this.containers.success : this.containers.failure;
+    var receiver = this.container[this.success() ? 'success' : 'failure'];
     var response = this.transport.responseText;
+    if (!this.options.evalScripts)
+      response = response.stripScripts();
+    if (receiver) {
+      if (this.options.insertion) {
+    if (!this.options.evalScripts) response = response.stripScripts();
+    if (receiver = $(receiver)) {
+      if (this.options.insertion)
         new this.options.insertion(receiver, response);
+      } else {
+        Element.update(receiver, response);
+      }
+    }
+    if (this.responseIsSuccess()) {
+      else
+        receiver.update(response);
+    }
+    if (this.success()) {
       if (this.onComplete)
         setTimeout(this.onComplete.bind(this), 10);
 …
   stop: function() {
     this.updater.onComplete = undefined;
+    this.updater.options.onComplete = undefined;
     clearTimeout(this.timer);
     (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
 …
+  }
 });
+function $() {
+  var results = [], element;
+  for (var i = 0; i < arguments.length; i++) {
+    element = arguments[i];
+    if (typeof element == 'string')
+      element = document.getElementById(element);
+    results.push(Element.extend(element));
+  }
+  return results.length < 2 ? results[0] : results;
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (typeof element == 'string')
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(query.snapshotItem(i));
+    return results;
+  };
+}
 document.getElementsByClassName = function(className, parentElement) {
+  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  return $A(children).inject([], function(elements, child) {
+    if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      elements.push(Element.extend(child));
+  if (Prototype.BrowserFeatures.XPath) {
+    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
+    return document._getElementsByXPath(q, parentElement);
+  } else {
+    var children = ($(parentElement) || document.body).getElementsByTagName('*');
+    var elements = [], child;
+    for (var i = 0, length = children.length; i < length; i++) {
+      child = children[i];
+      if (Element.hasClassName(child, className))
+        elements.push(Element.extend(child));
+    }
     return elements;
   });
+}
+  }
+};
 /*--------------------------------------------------------------------------*/
 …
 Element.extend = function(element) {
+  if (!element) return;
+  if (_nativeExtensions) return element;
+  if (!element || _nativeExtensions || element.nodeType == 3) return element;
   if (!element._extended && element.tagName && element != window) {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+    var methods = Object.clone(Element.Methods), cache = Element.extend.cache;
+    if (element.tagName == 'FORM')
+      Object.extend(methods, Form.Methods);
+    if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName))
+      Object.extend(methods, Form.Element.Methods);
+    Object.extend(methods, Element.Methods.Simulated);
+    for (var property in methods) {
       var value = methods[property];
       if (typeof value == 'function')
+      if (typeof value == 'function' && !(property in element))
         element[property] = cache.findOrStore(value);
+    }
 …
   element._extended = true;
   return element;
+}
+};
 Element.extend.cache = {
 …
+    }
+  }
+}
+};
 Element.Methods = {
 …
   },
+  toggle: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      Element[Element.visible(element) ? 'hide' : 'show'](element);
+    }
+  },
+  hide: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = 'none';
+    }
+  },
+  show: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
+      element.style.display = '';
+    }
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+  hide: function(element) {
+    $(element).style.display = 'none';
+    return element;
+  },
+  show: function(element) {
+    $(element).style.display = '';
+    return element;
   },
 …
     element = $(element);
     element.parentNode.removeChild(element);
+    return element;
   },
   update: function(element, html) {
+    html = typeof html == 'undefined' ? '' : html.toString();
     $(element).innerHTML = html.stripScripts();
     setTimeout(function() {html.evalScripts()}, 10);
+    return element;
   },
   replace: function(element, html) {
     element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
     if (element.outerHTML) {
       element.outerHTML = html.stripScripts();
 …
+    }
     setTimeout(function() {html.evalScripts()}, 10);
+    return element;
+  },
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+  descendants: function(element) {
+    return $A($(element).getElementsByTagName('*'));
+  },
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+  siblings: function(element) {
+    element = $(element);
+    return element.previousSiblings().reverse().concat(element.nextSiblings());
+  },
+  match: function(element, selector) {
+    if (typeof selector == 'string')
+      selector = new Selector(selector);
+    return selector.match($(element));
+  },
+  up: function(element, expression, index) {
+    return Selector.findElement($(element).ancestors(), expression, index);
+  },
+  down: function(element, expression, index) {
+    return Selector.findElement($(element).descendants(), expression, index);
+  },
+  previous: function(element, expression, index) {
+    return Selector.findElement($(element).previousSiblings(), expression, index);
+  },
+  next: function(element, expression, index) {
+    return Selector.findElement($(element).nextSiblings(), expression, index);
+  },
+  getElementsBySelector: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+  getElementsByClassName: function(element, className) {
+    return document.getElementsByClassName(className, element);
+  },
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (document.all && !window.opera) {
+      var t = Element._attributeTranslations;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name])  name = t.names[name];
+      var attribute = element.attributes[name];
+      if(attribute) return attribute.nodeValue;
+    }
+    return element.getAttribute(name);
   },
   getHeight: function(element) {
+    element = $(element);
+    return element.offsetHeight;
+    return $(element).getDimensions().height;
+  },
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
   },
 …
   hasClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).include(className);
+    var elementClassName = element.className;
+    if (elementClassName.length == 0) return false;
+    if (elementClassName == className ||
+        elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
+      return true;
+    return false;
   },
   addClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).add(className);
+    Element.classNames(element).add(className);
+    return element;
   },
   removeClassName: function(element, className) {
     if (!(element = $(element))) return;
+    return Element.classNames(element).remove(className);
+    Element.classNames(element).remove(className);
+    return element;
+  },
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
+    return element;
+  },
+  observe: function() {
+    Event.observe.apply(Event, arguments);
+    return $A(arguments).first();
+  },
+  stopObserving: function() {
+    Event.stopObserving.apply(Event, arguments);
+    return $A(arguments).first();
   },
 …
   cleanWhitespace: function(element) {
     element = $(element);
+    for (var i = 0; i < element.childNodes.length; i++) {
+      var node = element.childNodes[i];
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
       if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        Element.remove(node);
+    }
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
   },
 …
   },
   childOf: function(element, ancestor) {
+  descendantOf: function(element, ancestor) {
     element = $(element), ancestor = $(ancestor);
     while (element = element.parentNode)
 …
   scrollTo: function(element) {
     element = $(element);
     var x = element.x ? element.x : element.offsetLeft,
         y = element.y ? element.y : element.offsetTop;
     window.scrollTo(x, y);
+    var pos = Position.cumulativeOffset(element);
+    window.scrollTo(pos[0], pos[1]);
+    return element;
   },
   getStyle: function(element, style) {
     element = $(element);
+    var value = element.style[style.camelize()];
+    if (['float','cssFloat'].include(style))
+      style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat');
+    style = style.camelize();
+    var value = element.style[style];
     if (!value) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
         var css = document.defaultView.getComputedStyle(element, null);
         value = css ? css.getPropertyValue(style) : null;
+        value = css ? css[style] : null;
       } else if (element.currentStyle) {
         value = element.currentStyle[style.camelize()];
+        value = element.currentStyle[style];
+      }
+    }
+    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
+      value = element['offset'+style.capitalize()] + 'px';
     if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
       if (Element.getStyle(element, 'position') == 'static') value = 'auto';
+    if(style == 'opacity') {
+      if(value) return parseFloat(value);
+      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if(value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
     return value == 'auto' ? null : value;
   },
 …
   setStyle: function(element, style) {
     element = $(element);
+    for (var name in style)
+      element.style[name.camelize()] = style[name];
+    for (var name in style) {
+      var value = style[name];
+      if(name == 'opacity') {
+        if (value == 1) {
+          value = (/Gecko/.test(navigator.userAgent) &&
+            !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else if(value == '') {
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+        } else {
+          if(value < 0.00001) value = 0;
+          if(/MSIE/.test(navigator.userAgent) && !window.opera)
+            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
+              'alpha(opacity='+value*100+')';
+        }
+      } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
+      element.style[name.camelize()] = value;
+    }
+    return element;
   },
   getDimensions: function(element) {
     element = $(element);
+    if (Element.getStyle(element, 'display') != 'none')
+    var display = $(element).getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
       return {width: element.offsetWidth, height: element.offsetHeight};
 …
     var originalVisibility = els.visibility;
     var originalPosition = els.position;
+    var originalDisplay = els.display;
     els.visibility = 'hidden';
     els.position = 'absolute';
     els.display = '';
+    els.display = 'block';
     var originalWidth = element.clientWidth;
     var originalHeight = element.clientHeight;
     els.display = 'none';
+    els.display = originalDisplay;
     els.position = originalPosition;
     els.visibility = originalVisibility;
 …
+      }
+    }
+    return element;
   },
 …
         element.style.right = '';
+    }
+    return element;
   },
   makeClipping: function(element) {
     element = $(element);
     if (element._overflow) return;
     element._overflow = element.style.overflow;
+    if (element._overflow) return element;
+    element._overflow = element.style.overflow || 'auto';
     if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
       element.style.overflow = 'hidden';
+    return element;
   },
   undoClipping: function(element) {
     element = $(element);
+    if (element._overflow) return;
+    element.style.overflow = element._overflow;
+    element._overflow = undefined;
+  }
+}
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  }
+};
+Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
+Element._attributeTranslations = {};
+Element._attributeTranslations.names = {
+  colspan:   "colSpan",
+  rowspan:   "rowSpan",
+  valign:    "vAlign",
+  datetime:  "dateTime",
+  accesskey: "accessKey",
+  tabindex:  "tabIndex",
+  enctype:   "encType",
+  maxlength: "maxLength",
+  readonly:  "readOnly",
+  longdesc:  "longDesc"
+};
+Element._attributeTranslations.values = {
+  _getAttr: function(element, attribute) {
+    return element.getAttribute(attribute, 2);
+  },
+  _flag: function(element, attribute) {
+    return $(element).hasAttribute(attribute) ? attribute : null;
+  },
+  style: function(element) {
+    return element.style.cssText.toLowerCase();
+  },
+  title: function(element) {
+    var node = element.getAttributeNode('title');
+    return node.specified ? node.nodeValue : null;
+  }
+};
+Object.extend(Element._attributeTranslations.values, {
+  href: Element._attributeTranslations.values._getAttr,
+  src:  Element._attributeTranslations.values._getAttr,
+  disabled: Element._attributeTranslations.values._flag,
+  checked:  Element._attributeTranslations.values._flag,
+  readonly: Element._attributeTranslations.values._flag,
+  multiple: Element._attributeTranslations.values._flag
+});
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    var t = Element._attributeTranslations;
+    attribute = t.names[attribute] || attribute;
+    return $(element).getAttributeNode(attribute).specified;
+  }
+};
+// IE is missing .innerHTML support for TABLE-related elements
+if (document.all && !window.opera){
+  Element.Methods.update = function(element, html) {
+    element = $(element);
+    html = typeof html == 'undefined' ? '' : html.toString();
+    var tagName = element.tagName.toUpperCase();
+    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
+      var div = document.createElement('div');
+      switch (tagName) {
+        case 'THEAD':
+        case 'TBODY':
+          div.innerHTML = '<table><tbody>' +  html.stripScripts() + '</tbody></table>';
+          depth = 2;
+          break;
+        case 'TR':
+          div.innerHTML = '<table><tbody><tr>' +  html.stripScripts() + '</tr></tbody></table>';
+          depth = 3;
+          break;
+        case 'TD':
+          div.innerHTML = '<table><tbody><tr><td>' +  html.stripScripts() + '</td></tr></tbody></table>';
+          depth = 4;
+      }
+      $A(element.childNodes).each(function(node){
+        element.removeChild(node)
+      });
+      depth.times(function(){ div = div.firstChild });
+      $A(div.childNodes).each(
+        function(node){ element.appendChild(node) });
+    } else {
+      element.innerHTML = html.stripScripts();
+    }
+    setTimeout(function() {html.evalScripts()}, 10);
+    return element;
+  }
+};
 Object.extend(Element, Element.Methods);
 …
 var _nativeExtensions = false;
+if(!HTMLElement && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+  var HTMLElement = {}
+  HTMLElement.prototype = document.createElement('div').__proto__;
+}
+if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+  ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) {
+    var className = 'HTML' + tag + 'Element';
+    if(window[className]) return;
+    var klass = window[className] = {};
+    klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__;
+  });
 Element.addMethods = function(methods) {
   Object.extend(Element.Methods, methods || {});
+  if(typeof HTMLElement != 'undefined') {
+    var methods = Element.Methods, cache = Element.extend.cache;
+    for (property in methods) {
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    var cache = Element.extend.cache;
+    for (var property in methods) {
       var value = methods[property];
+      if (typeof value == 'function')
+        HTMLElement.prototype[property] = cache.findOrStore(value);
+    }
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = cache.findOrStore(value);
+    }
+  }
+  if (typeof HTMLElement != 'undefined') {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+    copy(Form.Methods, HTMLFormElement.prototype);
+    [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) {
+      copy(Form.Element.Methods, klass.prototype);
+    });
     _nativeExtensions = true;
+  }
+}
-Element.addMethods();
 var Toggle = new Object();
 …
         this.element.insertAdjacentHTML(this.adjacency, this.content);
       } catch (e) {
         var tagName = this.element.tagName.toLowerCase();
         if (tagName == 'tbody' || tagName == 'tr') {
+        var tagName = this.element.tagName.toUpperCase();
+        if (['TBODY', 'TR'].include(tagName)) {
           this.insertContent(this.contentFromAnonymousTable());
         } else {
 …
   add: function(classNameToAdd) {
     if (this.include(classNameToAdd)) return;
     this.set(this.toArray().concat(classNameToAdd).join(' '));
+    this.set($A(this).concat(classNameToAdd).join(' '));
   },
   remove: function(classNameToRemove) {
     if (!this.include(classNameToRemove)) return;
+    this.set(this.select(function(className) {
+      return className != classNameToRemove;
+    }).join(' '));
+    this.set($A(this).without(classNameToRemove).join(' '));
   },
   toString: function() {
     return this.toArray().join(' ');
+  }
+}
+    return $A(this).join(' ');
+  }
+};
 Object.extend(Element.ClassNames.prototype, Enumerable);
 …
       conditions.push('true');
     if (clause = params.id)
       conditions.push('element.id == ' + clause.inspect());
+      conditions.push('element.readAttribute("id") == ' + clause.inspect());
     if (clause = params.tagName)
       conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
     if ((clause = params.classNames).length > 0)
       for (var i = 0; i < clause.length; i++)
         conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
+      for (var i = 0, length = clause.length; i < length; i++)
+        conditions.push('element.hasClassName(' + clause[i].inspect() + ')');
     if (clause = params.attributes) {
       clause.each(function(attribute) {
         var value = 'element.getAttribute(' + attribute.name.inspect() + ')';
+        var value = 'element.readAttribute(' + attribute.name.inspect() + ')';
         var splitValueBy = function(delimiter) {
           return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
 …
           case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
           case '':
           case undefined: conditions.push(value + ' != null'); break;
+          case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break;
           default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
+        }
 …
   compileMatcher: function() {
     this.match = new Function('element', 'if (!element.tagName) return false; \
+      element = $(element); \
       return ' + this.buildMatchExpression());
   },
 …
     var results = [];
     for (var i = 0; i < scope.length; i++)
+    for (var i = 0, length = scope.length; i < length; i++)
       if (this.match(element = scope[i]))
         results.push(Element.extend(element));
 …
+}
+Object.extend(Selector, {
+  matchElements: function(elements, expression) {
+    var selector = new Selector(expression);
+    return elements.select(selector.match.bind(selector)).map(Element.extend);
+  },
+  findElement: function(elements, expression, index) {
+    if (typeof expression == 'number') index = expression, expression = false;
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+  findChildElements: function(element, expressions) {
+    return expressions.map(function(expression) {
+      return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) {
+        var selector = new Selector(expr);
+        return results.inject([], function(elements, result) {
+          return elements.concat(selector.findElements(result || element));
+        });
+      });
+    }).flatten();
+  }
+});
 function $$() {
+  return $A(arguments).map(function(expression) {
+    return expression.strip().split(/\s+/).inject([null], function(results, expr) {
+      var selector = new Selector(expr);
+      return results.map(selector.findElements.bind(selector)).flatten();
+    });
+  }).flatten();
+}
+var Field = {
+  clear: function() {
+    for (var i = 0; i < arguments.length; i++)
+      $(arguments[i]).value = '';
+  },
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+  serializeElements: function(elements, getHash) {
+    var data = elements.inject({}, function(result, element) {
+      if (!element.disabled && element.name) {
+        var key = element.name, value = $(element).getValue();
+        if (value != undefined) {
+          if (result[key]) {
+            if (result[key].constructor != Array) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+    return getHash ? data : Hash.toQueryString(data);
+  }
+};
+Form.Methods = {
+  serialize: function(form, getHash) {
+    return Form.serializeElements(Form.getElements(form), getHash);
+  },
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+    return matchingInputs;
+  },
+  disable: function(form) {
+    form = $(form);
+    form.getElements().each(function(element) {
+      element.blur();
+      element.disabled = 'true';
+    });
+    return form;
+  },
+  enable: function(form) {
+    form = $(form);
+    form.getElements().each(function(element) {
+      element.disabled = '';
+    });
+    return form;
+  },
+  findFirstElement: function(form) {
+    return $(form).getElements().find(function(element) {
+      return element.type != 'hidden' && !element.disabled &&
+        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  }
+}
+Object.extend(Form, Form.Methods);
+/*--------------------------------------------------------------------------*/
+Form.Element = {
   focus: function(element) {
     $(element).focus();
+  },
+  present: function() {
+    for (var i = 0; i < arguments.length; i++)
+      if ($(arguments[i]).value == '') return false;
+    return true;
+    return element;
   },
   select: function(element) {
     $(element).select();
+    return element;
+  }
+}
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = {};
+        pair[element.name] = value;
+        return Hash.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+  present: function(element) {
+    return $(element).value != '';
   },
 …
     element = $(element);
     element.focus();
+    if (element.select)
+    if (element.select && ( element.tagName.toLowerCase() != 'input' ||
+      !['button', 'reset', 'submit'].include(element.type) ) )
       element.select();
+  }
+}
+    return element;
+  },
+  disable: function(element) {
+    element = $(element);
+    element.disabled = true;
+    return element;
+  },
+  enable: function(element) {
+    element = $(element);
+    element.blur();
+    element.disabled = false;
+    return element;
+  }
+}
+Object.extend(Form.Element, Form.Element.Methods);
+var Field = Form.Element;
+var $F = Form.Element.getValue;
 /*--------------------------------------------------------------------------*/
-var Form = {
-  serialize: function(form) {
-    var elements = Form.getElements($(form));
-    var queryComponents = new Array();
-    for (var i = 0; i < elements.length; i++) {
-      var queryComponent = Form.Element.serialize(elements[i]);
-      if (queryComponent)
-        queryComponents.push(queryComponent);
+    }
-    return queryComponents.join('&');
-  },
-  getElements: function(form) {
-    form = $(form);
-    var elements = new Array();
-    for (var tagName in Form.Element.Serializers) {
-      var tagElements = form.getElementsByTagName(tagName);
-      for (var j = 0; j < tagElements.length; j++)
-        elements.push(tagElements[j]);
+    }
-    return elements;
-  },
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-    if (!typeName && !name)
-      return inputs;
-    var matchingInputs = new Array();
-    for (var i = 0; i < inputs.length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) ||
-          (name && input.name != name))
-        continue;
-      matchingInputs.push(input);
+    }
-    return matchingInputs;
-  },
-  disable: function(form) {
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
-      element.blur();
-      element.disabled = 'true';
+    }
-  },
-  enable: function(form) {
-    var elements = Form.getElements(form);
-    for (var i = 0; i < elements.length; i++) {
-      var element = elements[i];
-      element.disabled = '';
+    }
-  },
-  findFirstElement: function(form) {
-    return Form.getElements(form).find(function(element) {
-      return element.type != 'hidden' && !element.disabled &&
-        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-  focusFirstElement: function(form) {
-    Field.activate(Form.findFirstElement(form));
-  },
-  reset: function(form) {
-    $(form).reset();
+  }
+}
-Form.Element = {
-  serialize: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-    if (parameter) {
-      var key = encodeURIComponent(parameter[0]);
-      if (key.length == 0) return;
-      if (parameter[1].constructor != Array)
-        parameter[1] = [parameter[1]];
-      return parameter[1].map(function(value) {
-        return key + '=' + encodeURIComponent(value);
-      }).join('&');
+    }
-  },
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    var parameter = Form.Element.Serializers[method](element);
-    if (parameter)
-      return parameter[1];
+  }
+}
 Form.Element.Serializers = {
   input: function(element) {
     switch (element.type.toLowerCase()) {
-      case 'submit':
-      case 'hidden':
-      case 'password':
-      case 'text':
-        return Form.Element.Serializers.textarea(element);
       case 'checkbox':
       case 'radio':
         return Form.Element.Serializers.inputSelector(element);
+    }
+    return false;
+      default:
+        return Form.Element.Serializers.textarea(element);
+    }
   },
   inputSelector: function(element) {
+    if (element.checked)
+      return [element.name, element.value];
+    return element.checked ? element.value : null;
   },
   textarea: function(element) {
     return [element.name, element.value];
+    return element.value;
   },
   select: function(element) {
     return Form.Element.Serializers[element.type == 'select-one' ?
+    return this[element.type == 'select-one' ?
       'selectOne' : 'selectMany'](element);
   },
   selectOne: function(element) {
+    var value = '', opt, index = element.selectedIndex;
+    if (index >= 0) {
+      opt = element.options[index];
+      value = opt.value || opt.text;
+    }
+    return [element.name, value];
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
   },
   selectMany: function(element) {
+    var value = [];
+    for (var i = 0; i < element.length; i++) {
+    var values, length = element.length;
+    if (!length) return null;
+    for (var i = 0, values = []; i < length; i++) {
       var opt = element.options[i];
       if (opt.selected)
         value.push(opt.value || opt.text);
+    }
     return [element.name, value];
+  }
+}
+/*--------------------------------------------------------------------------*/
+var $F = Form.Element.getValue;
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+}
 /*--------------------------------------------------------------------------*/
 …
   onTimerEvent: function() {
     var value = this.getValue();
+    if (this.lastValue != value) {
+    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
+      ? this.lastValue != value : String(this.lastValue) != String(value));
+    if (changed) {
       this.callback(this.element, value);
       this.lastValue = value;
 …
   registerFormCallbacks: function() {
+    var elements = Form.getElements(this.element);
+    for (var i = 0; i < elements.length; i++)
+      this.registerCallback(elements[i]);
+    Form.getElements(this.element).each(this.registerCallback.bind(this));
   },
 …
           Event.observe(element, 'click', this.onElementEvent.bind(this));
           break;
+        case 'password':
+        case 'text':
+        case 'textarea':
+        case 'select-one':
+        case 'select-multiple':
+        default:
           Event.observe(element, 'change', this.onElementEvent.bind(this));
           break;
 …
   KEY_DOWN:     40,
   KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
   element: function(event) {
 …
   unloadCache: function() {
     if (!Event.observers) return;
     for (var i = 0; i < Event.observers.length; i++) {
+    for (var i = 0, length = Event.observers.length; i < length; i++) {
       Event.stopObserving.apply(this, Event.observers[i]);
       Event.observers[i][0] = null;
 …
   observe: function(element, name, observer, useCapture) {
     var element = $(element);
+    element = $(element);
     useCapture = useCapture || false;
 …
       name = 'keydown';
     this._observeAndCache(element, name, observer, useCapture);
+    Event._observeAndCache(element, name, observer, useCapture);
   },
   stopObserving: function(element, name, observer, useCapture) {
     var element = $(element);
+    element = $(element);
     useCapture = useCapture || false;
 …
       element = element.offsetParent;
       if (element) {
+        p = Element.getStyle(element, 'position');
+        if(element.tagName=='BODY') break;
+        var p = Element.getStyle(element, 'position');
         if (p == 'relative' || p == 'absolute') break;
+      }
 …
   },
-  clone: function(source, target) {
-    source = $(source);
-    target = $(target);
-    target.style.position = 'absolute';
-    var offsets = this.cumulativeOffset(source);
-    target.style.top    = offsets[1] + 'px';
-    target.style.left   = offsets[0] + 'px';
-    target.style.width  = source.offsetWidth + 'px';
-    target.style.height = source.offsetHeight + 'px';
-  },
   page: function(forElement) {
     var valueT = 0, valueL = 0;
 …
     element = forElement;
     do {
+      valueT -= element.scrollTop  || 0;
+      valueL -= element.scrollLeft || 0;
+      if (!window.opera || element.tagName=='BODY') {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
     } while (element = element.parentNode);
 …
     element.style.position = 'absolute';
     element.style.top    = top + 'px';;
     element.style.left   = left + 'px';;
     element.style.width  = width + 'px';;
     element.style.height = height + 'px';;
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
   },
 …
+  }
+}
+Element.addMethods();

tags/2.2/wp-includes/js/scriptaculous/scriptaculous.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// script.aculo.us scriptaculous.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 …
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 var Scriptaculous = {
   Version: '1.6.1',
+  Version: '1.7.0',
   require: function(libraryName) {
     // inserting via DOM fails in Safari 2.0, so brute force approach

tags/2.2/wp-includes/js/scriptaculous/slider.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Marty Haught, Thomas Fuchs
+// script.aculo.us slider.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs
 //
+// See http://script.aculo.us for more info
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 if(!Control) var Control = {};
 …
     this.trackLength = this.maximumOffset() - this.minimumOffset();
+    this.handleLength = this.isVertical() ? this.handles[0].offsetHeight : this.handles[0].offsetWidth;
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
+        this.handles[0].style.width.replace(/px$/,""));
     this.active   = false;
 …
   setValue: function(sliderValue, handleIdx){
     if(!this.active) {
       this.activeHandle    = this.handles[handleIdx];
       this.activeHandleIdx = handleIdx;
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
       this.updateStyles();
+    }
 …
   },
   maximumOffset: function(){
+    return(this.isVertical() ?
+      this.track.offsetHeight - this.alignY : this.track.offsetWidth - this.alignX);
+    return(this.isVertical() ?
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
+        this.track.style.width.replace(/px$/,"")) - this.alignY);
   },
   isVertical:  function(){
 …
         var handle = Event.element(event);
         var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        if(handle==this.track) {
+        var track = handle;
+        if(track==this.track) {
           var offsets  = Position.cumulativeOffset(this.track);
           this.event = event;
 …
           while((this.handles.indexOf(handle) == -1) && handle.parentNode)
             handle = handle.parentNode;
+          this.activeHandle    = handle;
+          this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+          this.updateStyles();
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+          if(this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }

tags/2.2/wp-includes/js/scriptaculous/unittest.js

-                      r5468
+                      r5480
+// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005 Michael Schuerig (http://www.schuerig.de/michael/)
+// script.aculo.us unittest.js v1.7.0, Fri Jan 19 19:16:36 CET 2007
+// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/)
 //
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 // experimental, Firefox-only
 …
     pointerX: 0,
     pointerY: 0,
+    buttons: 0
+    buttons:  0,
+    ctrlKey:  false,
+    altKey:   false,
+    shiftKey: false,
+    metaKey:  false
   }, arguments[2] || {});
   var oEvent = document.createEvent("MouseEvents");
   oEvent.initMouseEvent(eventName, true, true, document.defaultView,
     options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY,
     false, false, false, false, 0, $(element));
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
   if(this.mark) Element.remove(this.mark);
 …
     this.statusCell = document.createElement('td');
     this.nameCell = document.createElement('td');
+    this.nameCell.className = "nameCell";
     this.nameCell.appendChild(document.createTextNode(testName));
     this.messageCell = document.createElement('td');
 …
     this.statusCell.innerHTML = status;
     this.messageCell.innerHTML = this._toHTML(summary);
+    this.addLinksToResults();
   },
   message: function(message) {
 …
   _toHTML: function(txt) {
     return txt.escapeHTML().replace(/\n/g,"<br/>");
+  },
+  addLinksToResults: function(){
+    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run only this test"
+      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
+    });
+    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run all tests"
+      Event.observe(td, 'click', function(){ window.location.search = "";});
+    });
+  }
+}
 …
     }, arguments[1] || {});
     this.options.resultsURL = this.parseResultsURLQueryParameter();
+    this.options.tests      = this.parseTestsQueryParameter();
     if (this.options.testLog) {
       this.options.testLog = $(this.options.testLog) || null;
 …
         for(var testcase in testcases) {
           if(/^test/.test(testcase)) {
+            this.tests.push(new Test.Unit.Testcase(testcase, testcases[testcase], testcases["setup"], testcases["teardown"]));
+            this.tests.push(
+               new Test.Unit.Testcase(
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase,
+                 testcases[testcase], testcases["setup"], testcases["teardown"]
+               ));
+          }
+        }
 …
   parseResultsURLQueryParameter: function() {
     return window.location.search.parseQuery()["resultsURL"];
+  },
+  parseTestsQueryParameter: function(){
+    if (window.location.search.parseQuery()["tests"]){
+        return window.location.search.parseQuery()["tests"].split(',');
+    };
   },
   // Returns:
 …
+    }
     return (
+      (this.options.context ? this.options.context + ': ': '') +
       this.tests.length + " tests, " +
       assertions + " assertions, " +
 …
     catch(e) { this.error(e); }
   },
+  assertInspect: function(expected, actual) {
+    var message = arguments[2] || "assertInspect";
+    try { (expected == actual.inspect()) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
   assertEnumEqual: function(expected, actual) {
     var message = arguments[2] || "assertEnumEqual";
 …
     catch(e) { this.error(e); }
   },
+  assertIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertIdentical";
+    try { (expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertNotIdentical";
+    try { !(expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
   assertNull: function(obj) {
     var message = arguments[1] || 'assertNull'
 …
     catch(e) { this.error(e); }
   },
+  assertMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { (regex.exec(actual)) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
   assertHidden: function(element) {
     var message = arguments[1] || 'assertHidden';
 …
     var message = arguments[1] || 'assertNotNull';
     this.assert(object != null, message);
+  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try {
+      (actual.constructor == expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try {
+      (actual.constructor != expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
   },
   assertInstanceOf: function(expected, actual) {
 …
       this.fail(message + ": object was an instance of the not expected type"); }
     catch(e) { this.error(e); }
+  },
+  assertRespondsTo: function(method, obj) {
+    var message = arguments[2] || 'assertRespondsTo';
+    try {
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() :
+      this.fail(message + ": object doesn't respond to [" + method + "]"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() :
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() :
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
+  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try {
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e);
+    }
+  },
+  assertElementsMatch: function() {
+    var expressions = $A(arguments), elements = $A(expressions.shift());
+    if (elements.length != expressions.length) {
+      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+      return false;
+    }
+    elements.zip(expressions).all(function(pair, index) {
+      var element = $(pair.first()), expression = pair.last();
+      if (element.match(expression)) return true;
+      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+    }.bind(this)) && this.pass();
+  },
+  assertElementMatches: function(element, expression) {
+    this.assertElementsMatch([element], expression);
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' +
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
   },
   _isVisible: function(element) {
 …
     Test.Unit.Assertions.prototype.initialize.bind(this)();
     this.name           = name;
+    this.test           = test || function() {};
+    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
+      this.test = function() {
+        eval('with(this){'+test+'}');
+      }
+    } else {
+      this.test = test || function() {};
+    }
     this.setup          = setup || function() {};
     this.teardown       = teardown || function() {};
 …
+  }
 });
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse',
+    shouldRespondTo: 'assertRespondsTo'
+  };
+  Test.BDDMethods = {};
+  for(m in METHODMAP) {
+    Test.BDDMethods[m] = eval(
+      'function(){'+
+      'var args = $A(arguments);'+
+      'var scope = args.shift();'+
+      'scope.'+METHODMAP[m]+'.apply(scope,(args || []).concat([this])); }');
+  }
+  [Array.prototype, String.prototype, Number.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+}
+Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  var compiledSpec = {};
+  var titles = {};
+  for(specName in spec) {
+    switch(specName){
+      case "setup":
+      case "teardown":
+        compiledSpec[specName] = spec[specName];
+        break;
+      default:
+        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
+        var body = spec[specName].toString().split('\n').slice(1);
+        if(/^\{/.test(body[0])) body = body.slice(1);
+        body.pop();
+        body = body.map(function(statement){
+          return statement.strip()
+        });
+        compiledSpec[testName] = body.join('\n');
+        titles[testName] = specName;
+    }
+  }
+  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+};

tags/2.2/wp-includes/js/scriptaculous/wp-scriptaculous.js

r5468	r5480
13	13
14	14	var Scriptaculous = {
15		Version: '1.~~6.1~~',
	15	Version: '1.7.0',
16	16	require: function(libraryName) {
17	17	// inserting via DOM fails in Safari 2.0, so brute force approach

tags/2.2/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js

-                      r5468
+                      r5480
 /**
  * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 …
             author : 'Moxiecode Systems AB',
             authorurl : 'http://tinymce.moxiecode.com',
             infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html',
+            infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
             version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
         };

tags/2.2/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

-                      r5468
+                      r5480
 /**
  * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 …
             author : 'Moxiecode Systems AB',
             authorurl : 'http://tinymce.moxiecode.com',
             infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html',
+            infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
             version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
         };

tags/2.2/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

-                      r5468
+                      r5480
 /**
  * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
  * Moxiecode DHTML Windows script.
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 …
             author : 'Moxiecode Systems AB',
             authorurl : 'http://tinymce.moxiecode.com',
             infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html',
+            infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
             version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
         };
 …
 TinyMCE_Engine.prototype.orgOpenWindow = TinyMCE_Engine.prototype.openWindow;
+TinyMCE_Engine.prototype.orgCloseWindow = TinyMCE_Engine.prototype.closeWindow;
 TinyMCE_Engine.prototype.openWindow = function(template, args) {
 …
         height = 200;
+    if (!(minWidth = parseInt(template['minWidth'])))
+        minWidth = 100;
+    if (!(minHeight = parseInt(template['minHeight'])))
+        minHeight = 100;
     resizable = (args && args['resizable']) ? args['resizable'] : "no";
     scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
 …
     var elm = document.getElementById(this.selectedInstance.editorId + '_parent');
+    var pos = tinyMCE.getAbsPosition(elm);
+    if (tinyMCE.hasPlugin('fullscreen') && this.selectedInstance.getData('fullscreen').enabled)
+        pos = { absLeft: 0, absTop: 0 };
+    else
+        pos = tinyMCE.getAbsPosition(elm);
     // Center div in editor area
 …
     pos.absTop += Math.round((elm.firstChild.clientHeight / 2) - (height / 2));
+    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : '';
+    mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop);
+};
+TinyMCE_Engine.prototype.orgCloseWindow = TinyMCE_Engine.prototype.closeWindow;
+    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : ''; // WordPress cache buster
+    mcWindows.open(url, mcWindows.idCounter++, "modal=yes,width=" + width+ ",height=" + height + ",resizable=" + resizable + ",scrollbars=" + scrollbars + ",statusbar=" + resizable + ",left=" + pos.absLeft + ",top=" + pos.absTop + ",minWidth=" + minWidth + ",minHeight=" + minHeight );
+};
 TinyMCE_Engine.prototype.closeWindow = function(win) {
+    if (mcWindows.selectedWindow != null)
+        mcWindows.selectedWindow.close();
+    else
+    var gotit = false, n, w;
+    for (n in mcWindows.windows) {
+        w = mcWindows.windows[n];
+        if (typeof(w) == 'function') continue;
+        if (win.name == w.id + '_iframe') {
+            w.close();
+            gotit = true;
+        }
+    }
+    if (!gotit)
         this.orgCloseWindow(win);
+    tinyMCE.selectedInstance.getWin().focus();
 };
 …
     this.selectedWindow = null;
     this.lastSelectedWindow = null;
     this.zindex = 100;
+    this.zindex = 1001;
     this.mouseDownScreenX = 0;
     this.mouseDownScreenY = 0;
 …
     this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
+    this.addEvent(window, "resize", mcWindows.eventDispatcher);
+    this.addEvent(document, "scroll", mcWindows.eventDispatcher);
     this.doc = document;
+};
+TinyMCE_Windows.prototype.getBounds = function() {
+    if (!this.bounds) {
+        var vp = tinyMCE.getViewPort(window);
+        var top, left, bottom, right, docEl = this.doc.documentElement;
+        top    = vp.top;
+        left   = vp.left;
+        bottom = vp.height + top - 2;
+        right  = vp.width  + left - 22; // TODO this number is platform dependant
+        // x1, y1, x2, y2
+        this.bounds = [left, top, right, bottom];
+    }
+    return this.bounds;
+};
+TinyMCE_Windows.prototype.clampBoxPosition = function(x, y, w, h, minW, minH) {
+    var bounds = this.getBounds();
+    x = Math.max(bounds[0], Math.min(bounds[2], x + w) - w);
+    y = Math.max(bounds[1], Math.min(bounds[3], y + h) - h);
+    return this.clampBoxSize(x, y, w, h, minW, minH);
+};
+TinyMCE_Windows.prototype.clampBoxSize = function(x, y, w, h, minW, minH) {
+    var bounds = this.getBounds();
+    return [
+        x, y,
+        Math.max(minW, Math.min(bounds[2], x + w) - x),
+        Math.max(minH, Math.min(bounds[3], y + h) - y)
+    ];
 };
 …
             mcWindows.selectedWindow.onFocus(e);
             break;
+        case "scroll":
+        case "resize":
+            if (mcWindows.clampUpdateTimeout)
+                clearTimeout(mcWindows.clampUpdateTimeout);
+            mcWindows.clampEventType = e.type;
+            mcWindows.clampUpdateTimeout =
+                setTimeout(function () {mcWindows.updateClamping()}, 100);
+            break;
+    }
+};
+TinyMCE_Windows.prototype.updateClamping = function () {
+    var clamp, oversize, etype = mcWindows.clampEventType;
+    this.bounds = null; // Recalc window bounds on resize/scroll
+    this.clampUpdateTimeout = null;
+    for (var n in this.windows) {
+        win = this.windows[n];
+        if (typeof(win) == 'function' || ! win.winElement) continue;
+        clamp = mcWindows.clampBoxPosition(
+            win.left, win.top,
+            win.winElement.scrollWidth,
+            win.winElement.scrollHeight,
+            win.features.minWidth,
+            win.features.minHeight
+        );
+        oversize = (
+            clamp[2] != win.winElement.scrollWidth ||
+            clamp[3] != win.winElement.scrollHeight
+        ) ? true : false;
+        if (!oversize || win.features.resizable == "yes" || etype != "scroll")
+            win.moveTo(clamp[0], clamp[1]);
+        if (oversize && win.features.resizable == "yes")
+            win.resizeTo(clamp[2], clamp[3]);
+    }
 };
 …
         obj.attachEvent("on" + name, handler);
     else
         obj.addEventListener(name, handler, true);
+        obj.addEventListener(name, handler, false);
 };
 …
     options['width'] = "300";
     options['height'] = "300";
+    options['minwidth'] = "100";
+    options['minheight'] = "100";
     options['resizable'] = "yes";
     options['minimizable'] = "yes";
 …
     options['width'] = parseInt(options['width']);
     options['height'] = parseInt(options['height']);
+    options['minWidth'] = parseInt(options['minwidth']);
+    options['minHeight'] = parseInt(options['minheight']);
     return options;
 …
     features = this.parseFeatures(features);
+    // Clamp specified dimensions
+    var clamp = mcWindows.clampBoxPosition(
+        features['left'], features['top'],
+        features['width'], features['height'],
+        features['minWidth'], features['minHeight']
+    );
+    features['left'] = clamp[0];
+    features['top'] = clamp[1];
+    if (features['resizable'] == "yes") {
+        features['width'] = clamp[2];
+        features['height'] = clamp[3];
+    }
     // Create div
 …
     html += '<head>';
     html += '<title>Wrapper iframe</title>';
+    if (this.isMac) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;width:100%;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
     html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
     html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
-    if ( this.isMac ) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
     html += '</head>';
     html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
 …
     html += '    <div class="mceWindowHeadTools">';
     html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" target="_self" onmousedown="return false;" class="mceWindowClose"><img border="0" src="' + imgPath + '/window_close.gif" /></a>';
+//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].maximize();" target="_self" onmousedown="return false;" class="mceWindowMaximize"></a>';
+//  html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" target="_self" onmousedown="return false;" class="mceWindowMinimize"></a>';
+    if (features['resizable'] == "yes" && features['maximizable'] == "yes")
+        html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].maximize();" target="_self" onmousedown="return false;" class="mceWindowMaximize"><img border="0" src="' + imgPath + '/window_maximize.gif" /></a>';
+    // html += '      <a href="javascript:mcWindows.windows[\'' + name + '\'].minimize();" target="_self" onmousedown="return false;" class="mceWindowMinimize"></a>';
     html += '    </div>';
     html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
 …
 // Blocks the document events by placing a image over the whole document
 TinyMCE_Windows.prototype.setDocumentLock = function(state) {
+    var elm = document.getElementById('mcWindowEventBlocker');
     if (state) {
-        var elm = document.getElementById('mcWindowEventBlocker');
         if (elm == null) {
             elm = document.createElement("div");
 …
         elm.style.zIndex = mcWindows.zindex-1;
         elm.style.display = "block";
+    } else {
+        var elm = document.getElementById('mcWindowEventBlocker');
+    } else if (elm != null) {
         if (mcWindows.windows.length == 0)
             elm.parentNode.removeChild(elm);
 …
     div.setAttribute("height", (height));
     div.style.position = "absolute";
     div.style.left = left + "px";
     div.style.top = top + "px";
 …
     iframe.setAttribute("width", iframeWidth);
     iframe.setAttribute("height", iframeHeight);
 //  iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
+    // iframe.setAttribute("src", "../jscripts/tiny_mce/blank.htm");
     // iframe.setAttribute("allowtransparency", "false");
     iframe.setAttribute("scrolling", "no");
 …
 TinyMCE_Window.prototype.maximize = function() {
+    if (this.restoreSize) {
+        this.moveTo(this.restoreSize[0], this.restoreSize[1]);
+        this.resizeTo(this.restoreSize[2], this.restoreSize[3]);
+        this.updateClamping();
+        this.restoreSize = null;
+    } else {
+        var bounds = mcWindows.getBounds();
+        this.restoreSize = [
+            this.left, this.top,
+            this.winElement.scrollWidth,
+            this.winElement.scrollHeight
+        ];
+        this.moveTo(bounds[0], bounds[1]);
+        this.resizeTo(
+            bounds[2] - bounds[0],
+            bounds[3] - bounds[1]
+        );
+    }
 };
 …
     mcWindows.windows = mcWindowsNew;
 //  alert(mcWindows.doc.getElementById(this.id + "_iframe"));
+    // alert(mcWindows.doc.getElementById(this.id + "_iframe"));
     var e = mcWindows.doc.getElementById(this.id + "_iframe");
 …
     mcWindows.setDocumentLock(false);
-    tinyMCE.selectedInstance.getWin().focus();
 };
 TinyMCE_Window.prototype.onMouseMove = function(e) {
+    var scrollX = 0;//this.doc.body.scrollLeft;
+    var scrollY = 0;//this.doc.body.scrollTop;
+    var clamp;
     // Calculate real X, Y
     var dx = e.screenX - mcWindows.mouseDownScreenX;
 …
     switch (mcWindows.action) {
         case "resize":
+            width = mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX);
+            height = mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY);
+            width = width < 100 ? 100 : width;
+            height = height < 100 ? 100 : height;
+            this.wrapperIFrameElement.style.width = width+2;
+            this.wrapperIFrameElement.style.height = height+2;
+            this.wrapperIFrameElement.width = width+2;
+            this.wrapperIFrameElement.height = height+2;
+            this.winElement.style.width = width;
+            this.winElement.style.height = height;
+            height = height - this.deltaHeight;
+            this.containerElement.style.width = width;
+            this.iframeElement.style.width = width;
+            this.iframeElement.style.height = height;
+            this.bodyElement.style.width = width;
+            this.bodyElement.style.height = height;
+            this.headElement.style.width = width;
+            //this.statusElement.style.width = width;
+            clamp = mcWindows.clampBoxSize(
+                this.left, this.top,
+                mcWindows.mouseDownWidth + (e.screenX - mcWindows.mouseDownScreenX),
+                mcWindows.mouseDownHeight + (e.screenY - mcWindows.mouseDownScreenY),
+                this.features.minWidth, this.features.minHeight
+            );
+            this.resizeTo(clamp[2], clamp[3]);
             mcWindows.cancelEvent(e);
 …
             this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
             this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
+            this.winElement.style.left = this.left + "px";
+            this.winElement.style.top = this.top + "px";
+            this.updateClamping();
             mcWindows.cancelEvent(e);
             break;
+    }
+};
+TinyMCE_Window.prototype.moveTo = function (x, y) {
+    this.left = x;
+    this.top = y;
+    this.winElement.style.left = this.left + "px";
+    this.winElement.style.top = this.top + "px";
+};
+TinyMCE_Window.prototype.resizeTo = function (width, height) {
+    this.wrapperIFrameElement.style.width = (width+2) + 'px';
+    this.wrapperIFrameElement.style.height = (height+2) + 'px';
+    this.wrapperIFrameElement.width = width+2;
+    this.wrapperIFrameElement.height = height+2;
+    this.winElement.style.width = width + 'px';
+    this.winElement.style.height = height + 'px';
+    height = height - this.deltaHeight;
+    this.containerElement.style.width = width + 'px';
+    this.iframeElement.style.width = width + 'px';
+    this.iframeElement.style.height = height + 'px';
+    this.bodyElement.style.width = width + 'px';
+    this.bodyElement.style.height = height + 'px';
+    this.headElement.style.width = width + 'px';
+    //this.statusElement.style.width = width + 'px';
+};
+TinyMCE_Window.prototype.updateClamping = function () {
+    var clamp, oversize;
+    clamp = mcWindows.clampBoxPosition(
+        this.left, this.top,
+        this.winElement.scrollWidth,
+        this.winElement.scrollHeight,
+        this.features.minWidth, this.features.minHeight
+    );
+    oversize = (
+        clamp[2] != this.winElement.scrollWidth ||
+        clamp[3] != this.winElement.scrollHeight
+    ) ? true : false;
+    this.moveTo(clamp[0], clamp[1]);
+    if (this.features.resizable == "yes" && oversize)
+        this.resizeTo(clamp[2], clamp[3]);
 };
 …
 TinyMCE_Window.prototype.onMouseDown = function(e) {
     var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
     mcWindows.mouseDownScreenX = e.screenX;

tags/2.2/wp-includes/js/tinymce/plugins/paste/editor_plugin.js

-                      r5468
+                      r5480
 /**
  * $Id: editor_plugin_src.js 126 2006-10-22 16:19:55Z spocke $
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 …
             author : 'Moxiecode Systems AB',
             authorurl : 'http://tinymce.moxiecode.com',
             infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_paste.html',
+            infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
             version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
         };
 …
         if (tinyMCE.isMSIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false))
             tinyMCE.addEvent(inst.getBody(), "paste", TinyMCE_PastePlugin._handlePasteEvent);
+    },
+    handleEvent : function(e) {
+        // Force paste dialog if non IE browser
+        if (!tinyMCE.isRealIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false) && e.ctrlKey && e.keyCode == 86 && e.type == "keydown") {
+            window.setTimeout('tinyMCE.selectedInstance.execCommand("mcePasteText",true)', 1);
+            return tinyMCE.cancelEvent(e);
+        }
+        return true;
     },

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php

-                      r5468
+                      r5480
 <?php
 /* *
+/* *
  * Tiny Spelling Interface for TinyMCE Spell Checking.
+ *
  * Copyright © 2006 Moxiecode Systems AB
  */
-require_once("HttpClient.class.php");
 class TinyGoogleSpell {
 …
         for ($i=0; $i<count($matches); $i++)
             $words[] = substr($wordstr, $matches[$i][1], $matches[$i][2]);
+            $words[] = $this->unhtmlentities(mb_substr($wordstr, $matches[$i][1], $matches[$i][2], "UTF-8"));
         return $words;
+    }
+    function unhtmlentities($string) {
+        $string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string);
+        $string = preg_replace('~&#([0-9]+);~e', 'chr(\\1)', $string);
+        $trans_tbl = get_html_translation_table(HTML_ENTITIES);
+        $trans_tbl = array_flip($trans_tbl);
+        return strtr($string, $trans_tbl);
+    }
 …
         if (count($matches) > 0)
             $sug = explode("\t", $matches[0][4]);
+            $sug = explode("\t", utf8_encode($this->unhtmlentities($matches[0][4])));
         return $sug;
+    }
+    function _xmlChars($string) {
+       $trans = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
+       foreach ($trans as $k => $v)
+            $trans[$k] = "&#".ord($k).";";
+       return strtr($string, $trans);
+    }
     function _getMatches($word_list) {
+        $xml = "";
+        // Setup HTTP Client
+        $client = new HttpClient('www.google.com');
+        $client->setUserAgent('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR');
+        $client->setHandleRedirects(false);
+        $client->setDebug(false);
+        $server = "www.google.com";
+        $port = 443;
+        $path = "/tbproxy/spell?lang=" . $this->lang . "&hl=en";
+        $host = "www.google.com";
+        $url = "https://" . $server;
         // Setup XML request
+        $xml .= '<?xml version="1.0" encoding="utf-8" ?>';
+        $xml .= '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">';
+        $xml .= '<text>' . htmlentities($word_list) . '</text></spellrequest>';
+        $xml = '<?xml version="1.0" encoding="utf-8" ?><spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1"><text>' . $word_list . '</text></spellrequest>';
+        // Execute HTTP Post to Google
+        if (!$client->post('/tbproxy/spell?lang=' . $this->lang, $xml)) {
+            $this->errorMsg[] = 'An error occurred: ' . $client->getError();
+            return array();
+        $header  = "POST ".$path." HTTP/1.0 \r\n";
+        $header .= "MIME-Version: 1.0 \r\n";
+        $header .= "Content-type: application/PTI26 \r\n";
+        $header .= "Content-length: ".strlen($xml)." \r\n";
+        $header .= "Content-transfer-encoding: text \r\n";
+        $header .= "Request-number: 1 \r\n";
+        $header .= "Document-type: Request \r\n";
+        $header .= "Interface-Version: Test 1.4 \r\n";
+        $header .= "Connection: close \r\n\r\n";
+        $header .= $xml;
+        //$this->_debugData($xml);
+        // Use curl if it exists
+        if (function_exists('curl_init')) {
+            // Use curl
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL,$url);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $header);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+            $xml = curl_exec($ch);
+            curl_close($ch);
+        } else {
+            // Use raw sockets
+            $fp = fsockopen("ssl://" . $server, $port, $errno, $errstr, 30);
+            if ($fp) {
+                // Send request
+                fwrite($fp, $header);
+                // Read response
+                $xml = "";
+                while (!feof($fp))
+                    $xml .= fgets($fp, 128);
+                fclose($fp);
+            } else
+                echo "Could not open SSL connection to google.";
+        }
+        //$this->_debugData($xml);
         // Grab and parse content
-        $xml = $client->getContent();
         preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $xml, $matches, PREG_SET_ORDER);
         return $matches;
+    }
+    function _debugData($data) {
+        $fh = @fopen("debug.log", 'a+');
+        @fwrite($fh, $data);
+        @fclose($fh);
+    }
+}

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php

-                      r5468
+                      r5480
+ *
  */
 class TinyPspellShell {
 …
         $this->tmpfile = tempnam($config['tinypspellshell.tmp'], "tinyspell");
+        $this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang;
+        if(preg_match("#win#i",php_uname()))
+            $this->cmd = $config['tinypspellshell.aspell'] . " -a --lang=". $this->lang." --encoding=utf-8 -H < $this->tmpfile 2>&1";
+        else
+            $this->cmd = "cat ". $this->tmpfile ." | " . $config['tinypspellshell.aspell'] . " -a --encoding=utf-8 -H --lang=". $this->lang;
+    }
 …
             foreach($wordArray as $key => $value)
                 fwrite($fh, "^" . $value . "\n");
             fclose($fh);
         } else {
 …
         $data = shell_exec($this->cmd);
+        @unlink($this->tmpfile);
+        @unlink($this->tmpfile);
         $returnData = array();
         $dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);
 …
     // Returns array with suggestions or false if failed.
     function getSuggestion($word) {
+        if (function_exists("mb_convert_encoding"))
+            $word = mb_convert_encoding($word, "ISO-8859-1", mb_detect_encoding($word, "UTF-8"));
+        else
+            $word = utf8_encode($word);
         if ($fh = fopen($this->tmpfile, "w")) {
             fwrite($fh, "!\n");
 …
             fclose($fh);
         } else
             wp_die("Error opening tmp file.");
+            die("Error opening tmp file.");
         $data = shell_exec($this->cmd);
+        @unlink($this->tmpfile);
+        @unlink($this->tmpfile);
         $returnData = array();
         $dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY);
 …
         return $returnData;
+    }
+    function _debugData($data) {
+        $fh = @fopen("debug.log", 'a+');
+        @fwrite($fh, $data);
+        @fclose($fh);
+    }
+}

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/config.php

-                      r5468
+                      r5480
     $spellCheckerConfig = array();
+    // Spellchecker class use
+    // require_once("classes/TinyPspellShell.class.php"); // Command line pspell
+    require_once("classes/TinyGoogleSpell.class.php"); // Google web service
+    // require_once("classes/TinyPspell.class.php"); // Internal PHP version
     // General settings
     $spellCheckerConfig['enabled'] = true;
-    // Pspell shell specific settings
-    $spellCheckerConfig['tinypspellshell.aspell'] = '/usr/bin/aspell';
-    $spellCheckerConfig['tinypspellshell.tmp'] = '/tmp/tinyspell/0';
     // Default settings
 …
     $spellCheckerConfig['default.encoding'] = "";
+    // Spellchecker class use
+    if ( function_exists('pspell_new') )
+        require_once("classes/TinyPspell.class.php"); // Internal PHP version
+    elseif ( file_exists($spellCheckerConfig['tinypspellshell.aspell']) )
+        require_once("classes/TinyPspellShell.class.php"); // Command line pspell
+    else
+        require_once("classes/TinyGoogleSpell.class.php"); // Google web service
+    // Pspell shell specific settings
+    $spellCheckerConfig['tinypspellshell.aspell'] = '/usr/bin/aspell';
+    $spellCheckerConfig['tinypspellshell.tmp'] = '/tmp';
 ?>

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/css/content.css

r5468	r5480
1	1	.mceItemHiddenSpellWord {
2	2	background: url('../images/wline.gif') repeat-x bottom left;
3		~~bo2rder-bottom: 1px dashed red;~~
4	3	cursor: default;
5	4	}

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/css/spellchecker.css

r5468	r5480
32	32	font-weight: bold;
33	33	font-size: 11px;
	34	background-color: #FFF;
34	35	}

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js

-                      r5468
+                      r5480
+/**
+ * $RCSfile: editor_plugin_src.js,v $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/24 17:24:50 $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+tinyMCE.importPluginLanguagePack('spellchecker', 'en,sv,nn,nb');
+// Plucin static class
+var TinyMCE_SpellCheckerPlugin = {
+    _contextMenu : new TinyMCE_Menu(),
+    _menu : new TinyMCE_Menu(),
+    _counter : 0,
+    getInfo : function() {
+        return {
+            longname : 'Spellchecker',
+            author : 'Moxiecode Systems AB',
+            authorurl : 'http://tinymce.moxiecode.com',
+            infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_spellchecker.html',
+            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+        };
+    },
+    handleEvent : function(e) {
+        var elm = tinyMCE.isMSIE ? e.srcElement : e.target;
+        var inst = tinyMCE.selectedInstance, args = '';
+        var self = TinyMCE_SpellCheckerPlugin;
+        var cm = self._contextMenu;
+        var p, p2, x, y, sx, sy, h, elm;
+        // Handle click on word
+        if ((e.type == "click" || e.type == "contextmenu") && elm) {
+            do {
+                if (tinyMCE.getAttrib(elm, 'class') == "mceItemHiddenSpellWord") {
+                    inst.spellCheckerElm = elm;
+                    // Setup arguments
+                    args += 'id=' + inst.editorId + "|" + (++self._counter);
+                    args += '&cmd=suggest&check=' + escape(elm.innerHTML);
+                    args += '&lang=' + escape(inst.spellCheckerLang);
+                    elm = inst.spellCheckerElm;
+                    p = tinyMCE.getAbsPosition(inst.iframeElement);
+                    p2 = tinyMCE.getAbsPosition(elm);
+                    h = parseInt(elm.offsetHeight);
+                    sx = inst.getBody().scrollLeft;
+                    sy = inst.getBody().scrollTop;
+                    x = p.absLeft + p2.absLeft - sx;
+                    y = p.absTop + p2.absTop - sy + h;
+                    cm.clear();
+                    cm.addTitle(tinyMCE.getLang('lang_spellchecker_wait', '', true));
+                    cm.show();
+                    cm.moveTo(x, y);
+                    inst.selection.selectNode(elm, false, false);
+                    self._sendAjax(self.baseURL + "/tinyspell.php", self._ajaxResponse, 'post', args);
+                    tinyMCE.cancelEvent(e);
+                    return false;
+                }
+            } while ((elm = elm.parentNode));
+        }
+        return true;
+    },
+    initInstance : function(inst) {
+        var self = TinyMCE_SpellCheckerPlugin, m = self._menu, cm = self._contextMenu, e;
+        tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/spellchecker/css/content.css");
+        if (!tinyMCE.hasMenu('spellcheckercontextmenu')) {
+            tinyMCE.importCSS(document, tinyMCE.baseURL + "/plugins/spellchecker/css/spellchecker.css");
+            cm.init({drop_menu : false});
+            tinyMCE.addMenu('spellcheckercontextmenu', cm);
+        }
+        if (!tinyMCE.hasMenu('spellcheckermenu')) {
+            m.init({});
+            tinyMCE.addMenu('spellcheckermenu', m);
+        }
+        inst.spellCheckerLang = 'en';
+        self._buildSettingsMenu(inst, null);
+        e = self._getBlockBoxLayer(inst).create('div', 'mceBlockBox', document.getElementById(inst.editorId + '_parent'));
+        self._getMsgBoxLayer(inst).create('div', 'mceMsgBox', document.getElementById(inst.editorId + '_parent'));
+    },
+    _getMsgBoxLayer : function(inst) {
+        if (!inst.spellCheckerMsgBoxL)
+            inst.spellCheckerMsgBoxL = new TinyMCE_Layer(inst.editorId + '_spellcheckerMsgBox', false);
+        return inst.spellCheckerMsgBoxL;
+    },
+    _getBlockBoxLayer : function(inst) {
+        if (!inst.spellCheckerBoxL)
+            inst.spellCheckerBoxL = new TinyMCE_Layer(inst.editorId + '_spellcheckerBlockBox', false);
+        return inst.spellCheckerBoxL;
+    },
+    _buildSettingsMenu : function(inst, lang) {
+        var i, ar = tinyMCE.getParam('spellchecker_languages', '+English=en').split(','), p;
+        var self = TinyMCE_SpellCheckerPlugin, m = self._menu, c;
+        m.clear();
+        m.addTitle(tinyMCE.getLang('lang_spellchecker_langs', '', true));
+        for (i=0; i<ar.length; i++) {
+            if (ar[i] != '') {
+                p = ar[i].split('=');
+                c = 'mceMenuCheckItem';
+                if (p[0].charAt(0) == '+') {
+                    p[0] = p[0].substring(1);
+                    if (lang == null) {
+                        c = 'mceMenuSelectedItem';
+                        inst.spellCheckerLang = p[1];
+                    }
+                }
+                if (lang == p[1])
+                    c = 'mceMenuSelectedItem';
+                m.add({text : p[0], js : "tinyMCE.execInstanceCommand('" + inst.editorId + "','mceSpellCheckerSetLang',false,'" + p[1] + "');", class_name : c});
+            }
+        }
+    },
+    setupContent : function(editor_id, body, doc) {
+        TinyMCE_SpellCheckerPlugin._removeWords(doc);
+    },
+    getControlHTML : function(cn) {
+        switch (cn) {
+            case "spellchecker":
+                return TinyMCE_SpellCheckerPlugin._getMenuButtonHTML(cn, 'lang_spellchecker_desc', '{$pluginurl}/images/spellchecker.gif', 'lang_spellchecker_desc', 'mceSpellCheckerMenu', 'mceSpellCheck');
+        }
+        return "";
+    },
+    /**
+     * Returns the HTML code for a normal button control.
+     *
+     * @param {string} id Button control id, this will be the suffix for the element id, the prefix is the editor id.
+     * @param {string} lang Language variable key name to insert as the title/alt of the button image.
+     * @param {string} img Image URL to insert, {$themeurl} and {$pluginurl} will be replaced.
+     * @param {string} mlang Language variable key name to insert as the title/alt of the menu button image.
+     * @param {string} mid Menu by id to display when the menu button is pressed.
+     * @param {string} cmd Command to execute when the user clicks the button.
+     * @param {string} ui Optional user interface boolean for command.
+     * @param {string} val Optional value for command.
+     * @return HTML code for a normal button based in input information.
+     * @type string
+     */
+    _getMenuButtonHTML : function(id, lang, img, mlang, mid, cmd, ui, val) {
+        var h = '', m, x;
+        cmd = 'tinyMCE.hideMenus();tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + cmd + '\'';
+        if (typeof(ui) != "undefined" && ui != null)
+            cmd += ',' + ui;
+        if (typeof(val) != "undefined" && val != null)
+            cmd += ",'" + val + "'";
+        cmd += ');';
+        // Use tilemaps when enabled and found and never in MSIE since it loads the tile each time from cache if cahce is disabled
+        if (tinyMCE.getParam('button_tile_map') && (!tinyMCE.isMSIE || tinyMCE.isOpera) && (m = tinyMCE.buttonMap[id]) != null && (tinyMCE.getParam("language") == "en" || img.indexOf('$lang') == -1)) {
+            // Tiled button
+            x = 0 - (m * 20) == 0 ? '0' : 0 - (m * 20);
+            h += '<a id="{$editor_id}_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';
+            h += '<img src="{$themeurl}/images/spacer.gif" style="background-position: ' + x + 'px 0" title="{$' + lang + '}" />';
+            h += '<img src="{$themeurl}/images/button_menu.gif" title="{$' + lang + '}" class="mceMenuButton" onclick="' + mcmd + 'return false;" />';
+            h += '</a>';
+        } else {
+            if (tinyMCE.isMSIE && !tinyMCE.isOpera)
+                h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton" onmouseover="tinyMCE.plugins.spellchecker._menuButtonEvent(\'over\',this);" onmouseout="tinyMCE.plugins.spellchecker._menuButtonEvent(\'out\',this);">';
+            else
+                h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton">';
+            h += '<a href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceMenuButtonNormal" target="_self">';
+            h += '<img src="' + img + '" title="{$' + lang + '}" /></a>';
+            h += '<a href="#" onclick="tinyMCE.plugins.spellchecker._toggleMenu(\'{$editor_id}\',\'' + mid + '\');return false;" onmousedown="return false;"><img src="{$themeurl}/images/button_menu.gif" title="{$' + lang + '}" class="mceMenuButton" />';
+            h += '</a></span>';
+        }
+        return h;
+    },
+    _menuButtonEvent : function(e, o) {
+        if (o.className == 'mceMenuButtonFocus')
+            return;
+        if (e == 'over')
+            o.className = o.className + ' mceMenuHover';
+        else
+            o.className = o.className.replace(/\s.*$/, '');
+    },
+    _toggleMenu : function(editor_id, id) {
+        var self = TinyMCE_SpellCheckerPlugin;
+        var e = document.getElementById(editor_id + '_spellchecker');
+        var inst = tinyMCE.getInstanceById(editor_id);
+        if (self._menu.isVisible()) {
+            tinyMCE.hideMenus();
+            return;
+        }
+        tinyMCE.lastMenuBtnClass = e.className.replace(/\s.*$/, '');
+        tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButtonFocus');
+        self._menu.moveRelativeTo(e, 'bl');
+        self._menu.moveBy(tinyMCE.isMSIE && !tinyMCE.isOpera ? 0 : 1, -1);
+        if (tinyMCE.isOpera)
+            self._menu.moveBy(0, -2);
+        self._onMenuEvent(inst, self._menu, 'show');
+        self._menu.show();
+        tinyMCE.lastSelectedMenuBtn = editor_id + '_spellchecker';
+    },
+    _onMenuEvent : function(inst, m, n) {
+        TinyMCE_SpellCheckerPlugin._buildSettingsMenu(inst, inst.spellCheckerLang);
+    },
+    execCommand : function(editor_id, element, command, user_interface, value) {
+        var inst = tinyMCE.getInstanceById(editor_id), self = TinyMCE_SpellCheckerPlugin, args = '', co, bb, mb, nl, i, e;
+        // Handle commands
+        switch (command) {
+            case "mceSpellCheck":
+                if (!inst.spellcheckerOn) {
+                    inst.spellCheckerBookmark = inst.selection.getBookmark();
+                    // Setup arguments
+                    args += 'id=' + inst.editorId + "|" + (++self._counter);
+                    args += '&cmd=spell&check=' + escape(self._getWordList(inst.getBody())).replace(/%20/g, '+');
+                    args += '&lang=' + escape(inst.spellCheckerLang);
+                    co = document.getElementById(inst.editorId + '_parent').firstChild;
+                    bb = self._getBlockBoxLayer(inst);
+                    bb.moveRelativeTo(co, 'tl');
+                    bb.resizeTo(co.offsetWidth, co.offsetHeight);
+                    bb.show();
+                    // Setup message box
+                    mb = self._getMsgBoxLayer(inst);
+                    e = mb.getElement();
+                    e.innerHTML = '<span>' + tinyMCE.getLang('lang_spellchecker_swait', '', true) + '</span>';
+                    mb.show();
+                    mb.moveRelativeTo(co, 'cc');
+                    if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+                        nl = co.getElementsByTagName('select');
+                        for (i=0; i<nl.length; i++)
+                            nl[i].disabled = true;
+                    }
+                    inst.spellcheckerOn = true;
+                    tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButtonSelected');
+                    self._sendAjax(self.baseURL + "/tinyspell.php", self._ajaxResponse, 'post', args);
+                } else {
+                    self._removeWords(inst.getDoc());
+                    inst.spellcheckerOn = false;
+                    tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButton');
+                }
+                return true;
+            case "mceSpellCheckReplace":
+                if (inst.spellCheckerElm)
+                    tinyMCE.setOuterHTML(inst.spellCheckerElm, value);
+                self._checkDone(inst);
+                self._contextMenu.hide();
+                self._menu.hide();
+                return true;
+            case "mceSpellCheckIgnore":
+                if (inst.spellCheckerElm)
+                    self._removeWord(inst.spellCheckerElm);
+                self._checkDone(inst);
+                self._contextMenu.hide();
+                self._menu.hide();
+                return true;
+            case "mceSpellCheckIgnoreAll":
+                if (inst.spellCheckerElm)
+                    self._removeWords(inst.getDoc(), inst.spellCheckerElm.innerHTML);
+                self._checkDone(inst);
+                self._contextMenu.hide();
+                self._menu.hide();
+                return true;
+            case "mceSpellCheckerSetLang":
+                tinyMCE.hideMenus();
+                inst.spellCheckerLang = value;
+                self._removeWords(inst.getDoc());
+                inst.spellcheckerOn = false;
+                tinyMCE.switchClass(editor_id + '_spellchecker', 'mceMenuButton');
+                return true;
+        }
+        // Pass to next handler in chain
+        return false;
+    },
+    cleanup : function(type, content, inst) {
+        switch (type) {
+            case "get_from_editor_dom":
+                TinyMCE_SpellCheckerPlugin._removeWords(content);
+                inst.spellcheckerOn = false;
+                break;
+        }
+        return content;
+    },
+    // Private plugin specific methods
+    _displayUI : function(inst) {
+        var self = TinyMCE_SpellCheckerPlugin;
+        var bb = self._getBlockBoxLayer(inst);
+        var mb = self._getMsgBoxLayer(inst);
+        var nl, i;
+        var co = document.getElementById(inst.editorId + '_parent').firstChild;
+        if (tinyMCE.isMSIE && !tinyMCE.isOpera) {
+            nl = co.getElementsByTagName('select');
+            for (i=0; i<nl.length; i++)
+                nl[i].disabled = false;
+        }
+        bb.hide();
+        mb.hide();
+    },
+    _ajaxResponse : function(xml) {
+        var el = xml ? xml.documentElement : null;
+        var inst = tinyMCE.selectedInstance, self = TinyMCE_SpellCheckerPlugin;
+        var cmd = el ? el.getAttribute("cmd") : null, err, id = el ? el.getAttribute("id") : null;
+        if (id)
+            inst = tinyMCE.getInstanceById(id.substring(0, id.indexOf('|')));
+        self._displayUI(inst);
+        // Ignore suggestions for other ajax responses
+        if (cmd == "suggest" && id != inst.editorId + "|" + self._counter)
+            return;
+        if (!el) {
+            inst.spellcheckerOn = false;
+            tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+            alert("Could not execute AJAX call, server didn't return valid a XML.");
+            return;
+        }
+        err = el.getAttribute("error");
+        if (err == "true") {
+            inst.spellcheckerOn = false;
+            tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+            alert(el.getAttribute("msg"));
+            return;
+        }
+        switch (cmd) {
+            case "spell":
+                if (xml.documentElement.firstChild) {
+                    self._markWords(inst.getDoc(), inst.getBody(), el.firstChild.nodeValue.split(' '));
+                    inst.selection.moveToBookmark(inst.spellCheckerBookmark);
+                } else
+                    alert(tinyMCE.getLang('lang_spellchecker_no_mpell', '', true));
+                self._checkDone(inst);
+                break;
+            case "suggest":
+                self._buildMenu(el.firstChild ? el.firstChild.nodeValue.split(' ') : null, 10);
+                self._contextMenu.show();
+                break;
+        }
+    },
+    _getWordSeparators : function() {
+        var i, re = '', ch = tinyMCE.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
+        for (i=0; i<ch.length; i++)
+            re += '\\' + ch.charAt(i);
+        return re;
+    },
+    _getWordList : function(n) {
+        var i, x, s, nv = '', nl = tinyMCE.getNodeTree(n, new Array(), 3), wl = new Array();
+        var re = TinyMCE_SpellCheckerPlugin._getWordSeparators();
+        for (i=0; i<nl.length; i++)
+            nv += nl[i].nodeValue + " ";
+        nv = nv.replace(new RegExp('([0-9]|[' + re + '])', 'g'), ' ');
+        nv = tinyMCE.trim(nv.replace(/(\s+)/g, ' '));
+        nl = nv.split(/\s+/);
+        for (i=0; i<nl.length; i++) {
+            s = false;
+            for (x=0; x<wl.length; x++) {
+                if (wl[x] == nl[i]) {
+                    s = true;
+                    break;
+                }
+            }
+            if (!s)
+                wl[wl.length] = nl[i];
+        }
+        return wl.join(' ');
+    },
+    _removeWords : function(doc, word) {
+        var i, c, nl = doc.getElementsByTagName("span");
+        var self = TinyMCE_SpellCheckerPlugin;
+        var inst = tinyMCE.selectedInstance, b = inst ? inst.selection.getBookmark() : null;
+        word = typeof(word) == 'undefined' ? null : word;
+        for (i=nl.length-1; i>=0; i--) {
+            c = tinyMCE.getAttrib(nl[i], 'class');
+            if ((c == 'mceItemHiddenSpellWord' || c == 'mceItemHidden') && (word == null || nl[i].innerHTML == word))
+                self._removeWord(nl[i]);
+        }
+        if (b)
+            inst.selection.moveToBookmark(b);
+    },
+    _checkDone : function(inst) {
+        var i, w = 0, nl = inst.getDoc().getElementsByTagName("span")
+        var self = TinyMCE_SpellCheckerPlugin;
+        for (i=nl.length-1; i>=0; i--) {
+            c = tinyMCE.getAttrib(nl[i], 'class');
+            if (c == 'mceItemHiddenSpellWord')
+                w++;
+        }
+        if (w == 0) {
+            self._removeWords(inst.getDoc());
+            inst.spellcheckerOn = false;
+            tinyMCE.switchClass(inst.editorId + '_spellchecker', 'mceMenuButton');
+        }
+    },
+    _removeWord : function(e) {
+        tinyMCE.setOuterHTML(e, e.innerHTML);
+    },
+    _markWords : function(doc, n, wl) {
+        var i, nv, nn, nl = tinyMCE.getNodeTree(n, new Array(), 3);
+        var r1, r2, r3, r4, r5, w = '';
+        var re = TinyMCE_SpellCheckerPlugin._getWordSeparators();
+        for (i=0; i<wl.length; i++)
+            w += wl[i] + ((i == wl.length-1) ? '' : '|');
+        r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
+        r2 = new RegExp('^(' + w + ')', 'g');
+        r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
+        r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
+        r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
+        for (i=0; i<nl.length; i++) {
+            nv = nl[i].nodeValue;
+            if (r1.test(nv) || r2.test(nv) || r3.test(nv) || r4.test(nv)) {
+                nv = tinyMCE.xmlEncode(nv);
+                nv = nv.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+                nv = nv.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+                nn = doc.createElement('span');
+                nn.className = "mceItemHidden";
+                nn.innerHTML = nv;
+                // Remove old text node
+                nl[i].parentNode.replaceChild(nn, nl[i]);
+            }
+        }
+    },
+    _buildMenu : function(sg, max) {
+        var i, self = TinyMCE_SpellCheckerPlugin, cm = self._contextMenu;
+        cm.clear();
+        if (sg != null) {
+            cm.addTitle(tinyMCE.getLang('lang_spellchecker_sug', '', true));
+            for (i=0; i<sg.length && i<max; i++)
+                cm.addItem(sg[i], 'tinyMCE.execCommand("mceSpellCheckReplace",false,"' + sg[i] + '");');
+            cm.addSeparator();
+            cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_word', '', true), 'tinyMCE.execCommand(\'mceSpellCheckIgnore\');');
+            cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_words', '', true), 'tinyMCE.execCommand(\'mceSpellCheckIgnoreAll\');');
+        } else
+            cm.addTitle(tinyMCE.getLang('lang_spellchecker_no_sug', '', true));
+        cm.update();
+    },
+    _getAjaxHTTP : function() {
+        try {
+            return new ActiveXObject('Msxml2.XMLHTTP')
+        } catch (e) {
+            try {
+                return new ActiveXObject('Microsoft.XMLHTTP')
+            } catch (e) {
+                return new XMLHttpRequest();
+            }
+        }
+    },
+    /**
+     * Perform AJAX call.
+     *
+     * @param {string} u URL of AJAX service.
+     * @param {function} f Function to call when response arrives.
+     * @param {string} m Request method post or get.
+     * @param {Array} a Array with arguments to send.
+     */
+    _sendAjax : function(u, f, m, a) {
+        var x = TinyMCE_SpellCheckerPlugin._getAjaxHTTP();
+        x.open(m, u, true);
+        x.onreadystatechange = function() {
+            if (x.readyState == 4)
+                f(x.responseXML);
+        };
+        if (m == 'post')
+            x.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+        x.send(a);
+    }
+};
+// Register plugin
+tinyMCE.addPlugin('spellchecker', TinyMCE_SpellCheckerPlugin);
+tinyMCE.importPluginLanguagePack('spellchecker','en,fr,sv,nn,nb');var TinyMCE_SpellCheckerPlugin={_contextMenu:new TinyMCE_Menu(),_menu:new TinyMCE_Menu(),_counter:0,_ajaxPage:'/tinyspell.php',getInfo:function(){return{longname:'Spellchecker PHP',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_spellchecker.html',version:"1.0.3"};},handleEvent:function(e){var elm=tinyMCE.isMSIE?e.srcElement:e.target;var inst=tinyMCE.selectedInstance,args='';var self=TinyMCE_SpellCheckerPlugin;var cm=self._contextMenu;var p,p2,x,y,sx,sy,h,elm;if((e.type=="click"||e.type=="contextmenu")&&elm){do{if(tinyMCE.getAttrib(elm,'class')=="mceItemHiddenSpellWord"){inst.spellCheckerElm=elm;args+='id='+inst.editorId+"|"+(++self._counter);args+='&cmd=suggest&check='+encodeURIComponent(elm.innerHTML);args+='&lang='+escape(inst.spellCheckerLang);elm=inst.spellCheckerElm;p=tinyMCE.getAbsPosition(inst.iframeElement);p2=tinyMCE.getAbsPosition(elm);h=parseInt(elm.offsetHeight);sx=inst.getBody().scrollLeft;sy=inst.getBody().scrollTop;x=p.absLeft+p2.absLeft-sx;y=p.absTop+p2.absTop-sy+h;cm.clear();cm.addTitle(tinyMCE.getLang('lang_spellchecker_wait','',true));cm.show();cm.moveTo(x,y);inst.selection.selectNode(elm,false,false);self._sendAjax(self.baseURL+self._ajaxPage,self._ajaxResponse,'post',args);tinyMCE.cancelEvent(e);return false;}}while((elm=elm.parentNode));}return true;},initInstance:function(inst){var self=TinyMCE_SpellCheckerPlugin,m=self._menu,cm=self._contextMenu,e;tinyMCE.importCSS(inst.getDoc(),tinyMCE.baseURL+"/plugins/spellchecker/css/content.css");if(!tinyMCE.hasMenu('spellcheckercontextmenu')){tinyMCE.importCSS(document,tinyMCE.baseURL+"/plugins/spellchecker/css/spellchecker.css");cm.init({drop_menu:false});tinyMCE.addMenu('spellcheckercontextmenu',cm);}if(!tinyMCE.hasMenu('spellcheckermenu')){m.init({});tinyMCE.addMenu('spellcheckermenu',m);}inst.spellCheckerLang='en';self._buildSettingsMenu(inst,null);e=self._getBlockBoxLayer(inst).create('div','mceBlockBox',document.getElementById(inst.editorId+'_parent'));self._getMsgBoxLayer(inst).create('div','mceMsgBox',document.getElementById(inst.editorId+'_parent'));},_getMsgBoxLayer:function(inst){if(!inst.spellCheckerMsgBoxL)inst.spellCheckerMsgBoxL=new TinyMCE_Layer(inst.editorId+'_spellcheckerMsgBox',false);return inst.spellCheckerMsgBoxL;},_getBlockBoxLayer:function(inst){if(!inst.spellCheckerBoxL)inst.spellCheckerBoxL=new TinyMCE_Layer(inst.editorId+'_spellcheckerBlockBox',false);return inst.spellCheckerBoxL;},_buildSettingsMenu:function(inst,lang){var i,ar=tinyMCE.getParam('spellchecker_languages','+English=en').split(','),p;var self=TinyMCE_SpellCheckerPlugin,m=self._menu,c;m.clear();m.addTitle(tinyMCE.getLang('lang_spellchecker_langs','',true));for(i=0;i<ar.length;i++){if(ar[i]!=''){p=ar[i].split('=');c='mceMenuCheckItem';if(p[0].charAt(0)=='+'){p[0]=p[0].substring(1);if(lang==null){c='mceMenuSelectedItem';inst.spellCheckerLang=p[1];}}if(lang==p[1])c='mceMenuSelectedItem';m.add({text:p[0],js:"tinyMCE.execInstanceCommand('"+inst.editorId+"','mceSpellCheckerSetLang',false,'"+p[1]+"');",class_name:c});}}},setupContent:function(editor_id,body,doc){TinyMCE_SpellCheckerPlugin._removeWords(doc,null,true);},getControlHTML:function(cn){switch(cn){case"spellchecker":return TinyMCE_SpellCheckerPlugin._getMenuButtonHTML(cn,'lang_spellchecker_desc','{$pluginurl}/images/spellchecker.gif','lang_spellchecker_desc','mceSpellCheckerMenu','mceSpellCheck');}return"";},_getMenuButtonHTML:function(id,lang,img,mlang,mid,cmd,ui,val){var h='',m,x;cmd='tinyMCE.hideMenus();tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+cmd+'\'';if(typeof(ui)!="undefined"&&ui!=null)cmd+=','+ui;if(typeof(val)!="undefined"&&val!=null)cmd+=",'"+val+"'";cmd+=');';if(tinyMCE.getParam('button_tile_map')&&(!tinyMCE.isMSIE||tinyMCE.isOpera)&&(m=tinyMCE.buttonMap[id])!=null&&(tinyMCE.getParam("language")=="en"||img.indexOf('$lang')==-1)){x=0-(m*20)==0?'0':0-(m*20);h+='<a id="{$editor_id}_'+id+'" href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceTiledButton mceButtonNormal" target="_self">';h+='<img src="{$themeurl}/images/spacer.gif" style="background-position: '+x+'px 0" title="{$'+lang+'}" />';h+='<img src="{$themeurl}/images/button_menu.gif" title="{$'+lang+'}" class="mceMenuButton" onclick="'+mcmd+'return false;" />';h+='</a>';}else{if(tinyMCE.isMSIE&&!tinyMCE.isOpera)h+='<span id="{$editor_id}_'+id+'" class="mceMenuButton" onmouseover="tinyMCE.plugins.spellchecker._menuButtonEvent(\'over\',this);" onmouseout="tinyMCE.plugins.spellchecker._menuButtonEvent(\'out\',this);">';else h+='<span id="{$editor_id}_'+id+'" class="mceMenuButton">';h+='<a href="javascript:'+cmd+'" onclick="'+cmd+'return false;" onmousedown="return false;" class="mceMenuButtonNormal" target="_self">';h+='<img src="'+img+'" title="{$'+lang+'}" /></a>';h+='<a href="#" onclick="tinyMCE.plugins.spellchecker._toggleMenu(\'{$editor_id}\',\''+mid+'\');return false;" onmousedown="return false;"><img src="{$themeurl}/images/button_menu.gif" title="{$'+lang+'}" class="mceMenuButton" />';h+='</a></span>';}return h;},_menuButtonEvent:function(e,o){var t=this;window.setTimeout(function(){t._menuButtonEvent2(e,o);},1);},_menuButtonEvent2:function(e,o){if(o.className=='mceMenuButtonFocus')return;if(e=='over')o.className=o.className+' mceMenuHover';else o.className=o.className.replace(/\s.*$/,'');},_toggleMenu:function(editor_id,id){var self=TinyMCE_SpellCheckerPlugin;var e=document.getElementById(editor_id+'_spellchecker');var inst=tinyMCE.getInstanceById(editor_id);if(self._menu.isVisible()){tinyMCE.hideMenus();return;}tinyMCE.lastMenuBtnClass=e.className.replace(/\s.*$/,'');tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButtonFocus');self._menu.moveRelativeTo(e,'bl');self._menu.moveBy(tinyMCE.isMSIE&&!tinyMCE.isOpera?0:1,-1);if(tinyMCE.isOpera)self._menu.moveBy(0,-2);self._onMenuEvent(inst,self._menu,'show');self._menu.show();tinyMCE.lastSelectedMenuBtn=editor_id+'_spellchecker';},_onMenuEvent:function(inst,m,n){TinyMCE_SpellCheckerPlugin._buildSettingsMenu(inst,inst.spellCheckerLang);},execCommand:function(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id),self=TinyMCE_SpellCheckerPlugin,args='',co,bb,mb,nl,i,e,mbs;switch(command){case"mceSpellCheck":if(!inst.spellcheckerOn){inst.spellCheckerBookmark=inst.selection.getBookmark();if(tinyMCE.isRealIE)tinyMCE.setInnerHTML(inst.getBody(),inst.getBody().innerHTML);args+='id='+inst.editorId+"|"+(++self._counter);args+='&cmd=spell&check='+encodeURIComponent(self._getWordList(inst.getBody())).replace(/\'/g,'%27');args+='&lang='+escape(inst.spellCheckerLang);co=document.getElementById(inst.editorId+'_parent').firstChild;bb=self._getBlockBoxLayer(inst);bb.moveRelativeTo(co,'tl');bb.resizeTo(co.offsetWidth,co.offsetHeight);bb.show();mb=self._getMsgBoxLayer(inst);e=mb.getElement();if(e.childNodes[0])e.removeChild(e.childNodes[0]);mbs=document.createElement("span");mbs.innerHTML='<span>'+tinyMCE.getLang('lang_spellchecker_swait','',true)+'</span>';e.appendChild(mbs);mb.show();mb.moveRelativeTo(co,'cc');if(tinyMCE.isMSIE&&!tinyMCE.isOpera){nl=co.getElementsByTagName('select');for(i=0;i<nl.length;i++)nl[i].disabled=true;}inst.spellcheckerOn=true;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButtonSelected');self._sendAjax(self.baseURL+self._ajaxPage,self._ajaxResponse,'post',args);}else{self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButton');}return true;case"mceSpellCheckReplace":if(inst.spellCheckerElm)tinyMCE.setOuterHTML(inst.spellCheckerElm,value);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckIgnore":if(inst.spellCheckerElm)self._removeWord(inst.spellCheckerElm);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckIgnoreAll":if(inst.spellCheckerElm)self._removeWords(inst.getDoc(),inst.spellCheckerElm.innerHTML);self._checkDone(inst);self._contextMenu.hide();self._menu.hide();return true;case"mceSpellCheckerSetLang":tinyMCE.hideMenus();inst.spellCheckerLang=value;self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(editor_id+'_spellchecker','mceMenuButton');return true;}return false;},cleanup:function(type,content,inst){switch(type){case"get_from_editor_dom":TinyMCE_SpellCheckerPlugin._removeWords(content,null,true);inst.spellcheckerOn=false;break;}return content;},_displayUI:function(inst){var self=TinyMCE_SpellCheckerPlugin;var bb=self._getBlockBoxLayer(inst);var mb=self._getMsgBoxLayer(inst);var nl,i;var co=document.getElementById(inst.editorId+'_parent').firstChild;if(tinyMCE.isMSIE&&!tinyMCE.isOpera){nl=co.getElementsByTagName('select');for(i=0;i<nl.length;i++)nl[i].disabled=false;}bb.hide();mb.hide();},_ajaxResponse:function(xml){var el=xml?xml.documentElement:null;var inst=tinyMCE.selectedInstance,self=TinyMCE_SpellCheckerPlugin;var cmd=el?el.getAttribute("cmd"):null,err,id=el?el.getAttribute("id"):null;if(id)inst=tinyMCE.getInstanceById(id.substring(0,id.indexOf('|')));self._displayUI(inst);if(cmd=="suggest"&&id!=inst.editorId+"|"+self._counter)return;if(!el){inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');alert("Could not execute AJAX call, server didn't return valid a XML.");return;}err=el.getAttribute("error");if(err=="true"){inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');alert(el.getAttribute("msg"));return;}switch(cmd){case"spell":if(xml.documentElement.firstChild){self._markWords(inst.getDoc(),inst.getBody(),decodeURIComponent(el.firstChild.nodeValue).split('+'));inst.selection.moveToBookmark(inst.spellCheckerBookmark);if(tinyMCE.getParam('spellchecker_report_misspellings',false))alert(tinyMCE.getLang('lang_spellchecker_mpell_found','',true,{words:self._countWords(inst)}));}else alert(tinyMCE.getLang('lang_spellchecker_no_mpell','',true));self._checkDone(inst);inst.useCSS=false;break;case"suggest":self._buildMenu(el.firstChild?decodeURIComponent(el.firstChild.nodeValue).split('+'):null,10);self._contextMenu.show();break;}},_getWordSeparators:function(){var i,re='',ch=tinyMCE.getParam('spellchecker_word_separator_chars','\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}\u201d\u201c');for(i=0;i<ch.length;i++)re+='\\'+ch.charAt(i);return re;},_getWordList:function(n){var i,x,s,nv='',nl=tinyMCE.getNodeTree(n,new Array(),3),wl=new Array();var re=TinyMCE_SpellCheckerPlugin._getWordSeparators();for(i=0;i<nl.length;i++){if(!new RegExp('/SCRIPT|STYLE/').test(nl[i].parentNode.nodeName))nv+=nl[i].nodeValue+" ";}nv=nv.replace(new RegExp('([0-9]|['+re+'])','g'),' ');nv=tinyMCE.trim(nv.replace(/(\s+)/g,' '));nl=nv.split(/\s+/);for(i=0;i<nl.length;i++){s=false;for(x=0;x<wl.length;x++){if(wl[x]==nl[i]){s=true;break;}}if(!s&&nl[i].length>0)wl[wl.length]=nl[i];}return wl.join(' ');},_removeWords:function(doc,word,cleanup){var i,c,nl=doc.getElementsByTagName("span");var self=TinyMCE_SpellCheckerPlugin;var inst=tinyMCE.selectedInstance,b=inst?inst.selection.getBookmark():null;word=typeof(word)=='undefined'?null:word;for(i=nl.length-1;i>=0;i--){c=tinyMCE.getAttrib(nl[i],'class');if((c=='mceItemHiddenSpellWord'||c=='mceItemHidden')&&(word==null||nl[i].innerHTML==word))self._removeWord(nl[i]);}if(b&&!cleanup)inst.selection.moveToBookmark(b);},_checkDone:function(inst){var self=TinyMCE_SpellCheckerPlugin;var w=self._countWords(inst);if(w==0){self._removeWords(inst.getDoc());inst.spellcheckerOn=false;tinyMCE.switchClass(inst.editorId+'_spellchecker','mceMenuButton');}},_countWords:function(inst){var i,w=0,nl=inst.getDoc().getElementsByTagName("span"),c;var self=TinyMCE_SpellCheckerPlugin;for(i=nl.length-1;i>=0;i--){c=tinyMCE.getAttrib(nl[i],'class');if(c=='mceItemHiddenSpellWord')w++;}return w;},_removeWord:function(e){if(e!=null)tinyMCE.setOuterHTML(e,e.innerHTML);},_markWords:function(doc,n,wl){var i,nv,nn,nl=tinyMCE.getNodeTree(n,new Array(),3);var r1,r2,r3,r4,r5,w='';var re=TinyMCE_SpellCheckerPlugin._getWordSeparators();for(i=0;i<wl.length;i++){if(wl[i].length>0)w+=wl[i]+((i==wl.length-1)?'':'|');}for(i=0;i<nl.length;i++){nv=nl[i].nodeValue;r1=new RegExp('(['+re+'])('+w+')(['+re+'])','g');r2=new RegExp('^('+w+')','g');r3=new RegExp('('+w+')(['+re+']?)$','g');r4=new RegExp('^('+w+')(['+re+']?)$','g');r5=new RegExp('('+w+')(['+re+'])','g');if(r1.test(nv)||r2.test(nv)||r3.test(nv)||r4.test(nv)){nv=tinyMCE.xmlEncode(nv);nv=nv.replace(r5,'<span class="mceItemHiddenSpellWord">$1</span>$2');nv=nv.replace(r3,'<span class="mceItemHiddenSpellWord">$1</span>$2');nn=doc.createElement('span');nn.className="mceItemHidden";nn.innerHTML=nv;nl[i].parentNode.replaceChild(nn,nl[i]);}}},_buildMenu:function(sg,max){var i,self=TinyMCE_SpellCheckerPlugin,cm=self._contextMenu;cm.clear();if(sg!=null){cm.addTitle(tinyMCE.getLang('lang_spellchecker_sug','',true));for(i=0;i<sg.length&&i<max;i++)cm.addItem(sg[i],'tinyMCE.execCommand("mceSpellCheckReplace",false,"'+sg[i]+'");');cm.addSeparator();}else cm.addTitle(tinyMCE.getLang('lang_spellchecker_no_sug','',true));cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_word','',true),'tinyMCE.execCommand(\'mceSpellCheckIgnore\');');cm.addItem(tinyMCE.getLang('lang_spellchecker_ignore_words','',true),'tinyMCE.execCommand(\'mceSpellCheckIgnoreAll\');');cm.update();},_getAjaxHTTP:function(){try{return new ActiveXObject('Msxml2.XMLHTTP')}catch(e){try{return new ActiveXObject('Microsoft.XMLHTTP')}catch(e){return new XMLHttpRequest();}}},_sendAjax:function(u,f,m,a){var x=TinyMCE_SpellCheckerPlugin._getAjaxHTTP();x.open(m,u,true);x.onreadystatechange=function(){if(x.readyState==4)f(x.responseXML);};if(m=='post')x.setRequestHeader('Content-type','application/x-www-form-urlencoded');x.send(a);}};tinyMCE.addPlugin('spellchecker',TinyMCE_SpellCheckerPlugin);

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/langs/en.js

r5468	r5480
11	11	sug : 'Suggestions',
12	12	no_sug : 'No suggestions',
13		no_mpell : 'No misspellings found.'
	13	no_mpell : 'No misspellings found.',
	14	mpell_found : 'Found {$words} misspellings.'
14	15	});

tags/2.2/wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php

-                      r5468
+                      r5480
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
  */
+    // Ignore the Notice errors for now.
+    error_reporting(E_ALL ^ E_NOTICE);
     require_once("config.php");
 …
     // Get input parameters.
     $check = $_POST['check'];
     $cmd = sanitize($_POST['cmd']);
     $lang = sanitize($_POST['lang'], "strict");
     $mode = sanitize($_POST['mode'], "strict");
     $spelling = sanitize($_POST['spelling'], "strict");
     $jargon = sanitize($_POST['jargon'], "strict");
     $encoding = sanitize($_POST['encoding'], "strict");
     $sg = sanitize($_POST['sg'], "bool");
+    $check = urldecode($_REQUEST['check']);
+    $cmd = sanitize($_REQUEST['cmd']);
+    $lang = sanitize($_REQUEST['lang'], "strict");
+    $mode = sanitize($_REQUEST['mode'], "strict");
+    $spelling = sanitize($_REQUEST['spelling'], "strict");
+    $jargon = sanitize($_REQUEST['jargon'], "strict");
+    $encoding = sanitize($_REQUEST['encoding'], "strict");
+    $sg = sanitize($_REQUEST['sg'], "bool");
     $words = array();
 …
                 $result = $tinyspell->checkWords($words);
             break;
             case "suggest":
                 $result = $tinyspell->getSuggestion($check);
             break;
             default:
                 // Just use this for now.
 …
         case "xml":
             header('Content-type: text/xml; charset=utf-8');
+            echo '<?xml version="1.0" encoding="utf-8" ?>';
+            echo "\n";
+            $body  = '<?xml version="1.0" encoding="utf-8" ?>';
+            $body .= "\n";
             if (count($result) == 0)
                 echo '<res id="' . $id . '" cmd="'. $cmd .'" />';
+                $body .= '<res id="' . $id . '" cmd="'. $cmd .'" />';
             else
                 echo '<res id="' . $id . '" cmd="'. $cmd .'">'. utf8_encode(implode(" ", $result)) .'</res>';
+                $body .= '<res id="' . $id . '" cmd="'. $cmd .'">'. urlencode(implode(" ", $result)) .'</res>';
+            echo $body;
         break;
         case "xmlerror";
             header('Content-type: text/xml; charset=utf-8');
+            echo '<?xml version="1.0" encoding="utf-8" ?>';
+            echo "\n";
+            echo '<res id="' . $id . '" cmd="'. $cmd .'" error="true" msg="'. implode(" ", $tinyspell->errorMsg) .'" />';
+            $body  = '<?xml version="1.0" encoding="utf-8" ?>';
+            $body .= "\n";
+            $body .= '<res id="' . $id . '" cmd="'. $cmd .'" error="true" msg="'. implode(" ", $tinyspell->errorMsg) .'" />';
+            echo $body;
         break;
         case "html":
 …
         break;
+    }
+?>
+?>

tags/2.2/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

r5468	r5480
516	516
517	517	// Tweak the widths
518		ta.parentNode.style.paddingRight = '2px';
	518	ta.parentNode.style.paddingRight = '12px';
519	519
520	520	if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {

tags/2.2/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

r5468	r5480
30	30	numlist_desc : 'Ordered list (' + metaKey + '+o)',
31	31	outdent_desc : 'Outdent (' + metaKey + '+w)',
32		indent_desc : 'Indent ~~List/B~~lockquote (' + metaKey + '+q)'
	32	indent_desc : 'Indent list/blockquote (' + metaKey + '+q)'
33	33	});

tags/2.2/wp-includes/js/tinymce/plugins/wordpress/wordpress.css

r5468	r5480
49	49	overflow: hidden;
50	50	padding-left: 12px;
51		~~background-image: url('../images/anchor_symbol.gif');~~
52	51	background-position: bottom;
53	52	background-repeat: no-repeat;

tags/2.2/wp-includes/js/tinymce/themes/advanced/about.htm

r5468	r5480
22	22	<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
23	23	by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
24		<p>Copyright © 2003-2006, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
	24	<p>Copyright © 2003-2007, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
25	25	<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
26	26

tags/2.2/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css

-                      r5468
+                      r5480
 /* This file contains the CSS data for the editor UI of TinyMCE instances */
 .mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {border: 0;  margin: 0;  padding: 0;  background: transparent;}
+.mceToolbarTop a, .mceToolbarTop a:visited, .mceToolbarTop a:hover, .mceToolbarBottom a, .mceToolbarBottom a:visited, .mceToolbarBottom a:hover {border: 0; margin: 0; padding: 0; background: transparent;}
 .mceSeparatorLine {border: 0; padding: 0; margin-left: 4px; margin-right: 2px;}
 .mceSelectList {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 7pt !important; font-weight: normal; margin-top: 3px; padding: 0; display: inline; vertical-align: top; background-color: #F0F0EE;}
 .mceLabel, .mceLabelDisabled {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt;}
 .mceLabel {color: #000000;}
 .mceLabelDisabled {cursor: text;  color: #999999;}
 .mceEditor {background: #F0F0EE;  border: 1px solid #cccccc;  padding: 0;  margin: 0;}
 .mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;  background: #FFFFFF;  padding: 0;  margin: 0;  }
 .mceToolbarTop, .mceToolbarBottom {background: #F0F0EE;  line-height: 1px;  font-size: 1px;}
+.mceLabelDisabled {cursor: text; color: #999999;}
+.mceEditor {background: #F0F0EE; border: 1px solid #cccccc; padding: 0; margin: 0;}
+.mceEditorArea { font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; background: #FFFFFF; padding: 0; margin: 0; }
+.mceToolbarTop, .mceToolbarBottom {background: #F0F0EE; line-height: 1px; font-size: 1px;}
 .mceToolbarTop {border-bottom: 1px solid #cccccc; padding-bottom: 1px;}
 .mceToolbarBottom {border-top: 1px solid #cccccc;}
 .mceToolbarContainer {position: relative;  left: 0;  top: 0;  display: block;}
+.mceToolbarContainer {display: block; position: relative; left: 0; top: 0; width: 100%;}
 .mceStatusbarTop, .mceStatusbarBottom, .mceStatusbar {height: 20px;}
 .mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;  font-size: 9pt;  padding: 2px;  line-height: 16px;  overflow: visible;}
+.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt; padding: 2px; line-height: 16px; overflow: visible;}
 .mceStatusbarTop {border-bottom: 1px solid #cccccc;}
 .mceStatusbarBottom {border-top: 1px solid #cccccc;}
 .mceStatusbar {border-bottom: 1px solid #cccccc;}
 .mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {text-decoration: none;  font-family: 'MS Sans Serif', sans-serif, Verdana, Arial;  font-size: 9pt;  color: #000000;}
+.mcePathItem, .mcePathItem:link, .mcePathItem:visited, .mcePathItem:hover {text-decoration: none; font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt; color: #000000;}
 .mcePathItem:hover {text-decoration: underline;}
 .mceStatusbarPathText {float: left;}
 .mceStatusbarResize {float: right;  background-image: url('../images/statusbar_resize.gif');  background-repeat: no-repeat;  width: 11px;  height: 20px;  cursor: se-resize;}
 .mceResizeBox {width: 10px;  height: 10px;  display: none;  border: 1px dotted gray;  margin: 0;  padding: 0;}
+.mceStatusbarResize {float: right; background-image: url('../images/statusbar_resize.gif'); background-repeat: no-repeat; width: 11px; height: 20px; cursor: se-resize;}
+.mceResizeBox {width: 10px; height: 10px; display: none; border: 1px dotted gray; margin: 0; padding: 0;}
 .mceEditorIframe {border: 0;}
 /* Button CSS rules */
 a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px;  height: 20px;  cursor: default;  margin-top: 1px;  margin-left: 1px;}
+a.mceButtonDisabled img, a.mceButtonNormal img, a.mceButtonSelected img {width: 20px; height: 20px; cursor: default; margin-top: 1px; margin-left: 1px;}
 a.mceButtonDisabled img {border: 0 !important;}
 a.mceButtonNormal img, a.mceButtonSelected img {border: 1px solid #F0F0EE !important;}
 a.mceButtonSelected img {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
 a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {border: 1px solid #0A246A !important;  cursor: default;  background-color: #B6BDD2;}
 a.mceButtonDisabled img {-moz-opacity:0.3;  opacity: 0.3;  border: 1px solid #F0F0EE !important;  cursor: default;}
 a.mceTiledButton img {background-image: url('../images/buttons.gif');  background-repeat: no-repeat;}
+a.mceButtonSelected img {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+a.mceButtonNormal img:hover, a.mceButtonSelected img:hover {border: 1px solid #0A246A !important; cursor: default; background-color: #B6BDD2;}
+a.mceButtonDisabled img {-moz-opacity:0.3; opacity: 0.3; border: 1px solid #F0F0EE !important; cursor: default;}
+a.mceTiledButton img {background-image: url('../images/buttons.gif'); background-repeat: no-repeat;}
 /* Menu button CSS rules */
 span.mceMenuButton img, span.mceMenuButtonSelected img {border: 1px solid #F0F0EE;  margin-left: 1px;}
 span.mceMenuButtonSelected img {border: 1px solid #6779AA;  background-color: #B6BDD2;}
 span.mceMenuButtonSelected img.mceMenuButton {border: 1px solid #F0F0EE;  background-color: transparent;}
 span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {border-left: 0;  margin-left: 0;}
 span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {border: 1px solid #0A246A;  background-color: #B6BDD2;}
+span.mceMenuButton img, span.mceMenuButtonSelected img {border: 1px solid #F0F0EE; margin-left: 1px;}
+span.mceMenuButtonSelected img {border: 1px solid #6779AA; background-color: #B6BDD2;}
+span.mceMenuButtonSelected img.mceMenuButton {border: 1px solid #F0F0EE; background-color: transparent;}
+span.mceMenuButton img.mceMenuButton, span.mceMenuButtonSelected img.mceMenuButton {border-left: 0; margin-left: 0;}
+span.mceMenuButton:hover img, span.mceMenuButtonSelected:hover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
 span.mceMenuButton:hover img.mceMenuButton, span.mceMenuButtonSelected:hover img.mceMenuButton {border-left: 0;}
 span.mceMenuButtonFocus img {border: 1px solid gray;  border-right: 0;  margin-left: 1px;  background-color: #F5F4F2;}
 span.mceMenuButtonFocus img.mceMenuButton {border: 1px solid gray;  border-left: 1px solid #F5F4F2;  margin-left: 0;}
 span.mceMenuHover img {border: 1px solid #0A246A;  background-color: #B6BDD2;}
 span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {border: 1px solid #0A246A;  background-color: #B6BDD2;  border-left: 0;}
+span.mceMenuButtonFocus img {border: 1px solid gray; border-right: 0; margin-left: 1px; background-color: #F5F4F2;}
+span.mceMenuButtonFocus img.mceMenuButton {border: 1px solid gray; border-left: 1px solid #F5F4F2; margin-left: 0;}
+span.mceMenuHover img {border: 1px solid #0A246A; background-color: #B6BDD2;}
+span.mceMenuButtonSelected.mceMenuHover img.mceMenuButton {border: 1px solid #0A246A; background-color: #B6BDD2; border-left: 0;}
 /* Menu */
 .mceMenu {position: absolute;  left: 0;  top: 0;  display: none;  z-index: 100;  background-color: white;  border: 1px solid gray;  font-weight: normal;}
 .mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block;  width: 100%;  text-decoration: none;  background-color: white;  font-family: Tahoma, Verdana, Arial, Helvetica;  font-size: 11px;  line-height: 20px;  color: black;}
 .mceMenu a:hover {background-color: #B6BDD2;  color: black;  text-decoration: none !important;}
 .mceMenu span {padding-left: 10px;  padding-right: 10px;  display: block;  line-height: 20px;}
 .mceMenuSeparator {border-bottom: 1px solid gray;  background-color: gray;  height: 1px;}
+.mceMenu {position: absolute; left: 0; top: 0; display: none; z-index: 1000; background-color: white; border: 1px solid gray; font-weight: normal;}
+.mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block; width: 100%; text-decoration: none; background-color: white; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; line-height: 20px; color: black;}
+.mceMenu a:hover {background-color: #B6BDD2; color: black; text-decoration: none !important;}
+.mceMenu span {padding-left: 10px; padding-right: 10px; display: block; line-height: 20px;}
+.mceMenuSeparator {border-bottom: 1px solid gray; background-color: gray; height: 1px;}
 .mceMenuTitle span {padding-left: 5px;}
 .mceMenuTitle {background-color: #DDDDDD;  font-weight: bold;}
+.mceMenuTitle {background-color: #DDDDDD; font-weight: bold;}
 .mceMenuDisabled {color: gray;}
 span.mceMenuSelectedItem {background-image: url('../images/menu_check.gif');  background-repeat: no-repeat;  background-position: 5px 8px;  padding-left: 20px;}
+span.mceMenuSelectedItem {background-image: url('../images/menu_check.gif'); background-repeat: no-repeat; background-position: 5px 8px; padding-left: 20px;}
 span.mceMenuCheckItem {padding-left: 20px;}
 span.mceMenuLine {display: block;  position: absolute;  left: 0;  top: -1px;  background-color: #F5F4F2;  width: 30px;  height: 1px;  overflow: hidden;  padding-left: 0;  padding-right: 0;}
 .mceColors table, .mceColors td {margin: 0;  padding: 2px;}
 a.mceMoreColors {width: 130px;  margin: 0;  padding: 0;  margin-left: 3px;  margin-bottom: 3px;  text-align: center;  border: 1px solid white;}
 .mceColorPreview {position: absolute;  left: 0;  top: 0;  margin-left: 3px;  margin-top: 15px;  width: 16px;  height: 4px;  background-color: red;}
+span.mceMenuLine {display: block; position: absolute; left: 0; top: -1px; background-color: #F5F4F2; width: 30px; height: 1px; overflow: hidden; padding-left: 0; padding-right: 0;}
+.mceColors table, .mceColors td {margin: 0; padding: 2px;}
+a.mceMoreColors {width: auto; padding: 0; margin: 0 3px 3px 3px; text-align: center; border: 1px solid white; text-decoration: none !important;}
+.mceColorPreview {position: absolute; overflow:hidden; left: 0; top: 0; margin-left: 3px; margin-top: 15px; width: 16px; height: 4px; background-color: red;}
 a.mceMoreColors:hover {border: 1px solid #0A246A;}
 .mceColors td a {width: 9px;  height: 9px;  overflow: hidden;  border: 1px solid #808080;}
+.mceColors td a {width: 9px; height: 9px; overflow: hidden; border: 1px solid #808080;}
 /* MSIE 6 specific rules */
 * html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {border: 0 !important;  margin-top: 2px;  margin-bottom: 1px;}
 * html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);  border: 0 !important;}
+* html a.mceButtonNormal img, * html a.mceButtonSelected img, * html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
+* html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); border: 0 !important;}
 * html a.mceButtonDisabled {border: 1px solid #F0F0EE !important;}
 * html a.mceButtonNormal, * html a.mceButtonSelected {border: 1px solid #F0F0EE !important;  cursor: default;}
 * html a.mceButtonSelected {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
 * html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {border: 1px solid #0A246A !important;  background-color: #B6BDD2;  cursor: default;}
+* html a.mceButtonNormal, * html a.mceButtonSelected {border: 1px solid #F0F0EE !important; cursor: default;}
+* html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+* html a.mceButtonNormal:hover, * html a.mceButtonSelected:hover {border: 1px solid #0A246A !important; background-color: #B6BDD2; cursor: default;}
 * html .mceSelectList {margin-top: 2px;}
 * html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative;  left: 0;  top: 0;}
 * html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative;  top: 1px;}
 * html a.mceMoreColors {width: 132px;}
 * html .mceColors td a {width: 10px;  height: 10px;}
 * html .mceColorPreview {margin-left: 2px;  margin-top: 14px;}
+* html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
+* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative; top: 1px;}
+* html a.mceMoreColors {width: auto;}
+* html .mceColors td a {width: 10px; height: 10px;}
+* html .mceColorPreview {margin-left: 2px; margin-top: 14px;}
 /* MSIE 7 specific rules */
 *:first-child+html a.mceButtonNormal img, *:first-child+html a.mceButtonSelected img, *:first-child+html a.mceButtonDisabled img {border: 0 !important;  margin-top: 2px;  margin-bottom: 1px;}
 *:first-child+html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);  border: 0 !important;}
+*:first-child+html a.mceButtonNormal img, *:first-child+html a.mceButtonSelected img, *:first-child+html a.mceButtonDisabled img {border: 0 !important; margin-top: 2px; margin-bottom: 1px;}
+*:first-child+html a.mceButtonDisabled img {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30); border: 0 !important;}
 *:first-child+html a.mceButtonDisabled {border: 1px solid #F0F0EE !important;}
 *:first-child+html a.mceButtonNormal, *:first-child+html a.mceButtonSelected {border: 1px solid #F0F0EE !important;  cursor: default;}
 *:first-child+html a.mceButtonSelected {border: 1px solid #6779AA !important;  background-color: #D4D5D8;}
 *:first-child+html a.mceButtonNormal:hover, *:first-child+html a.mceButtonSelected:hover {border: 1px solid #0A246A !important;  background-color: #B6BDD2;  cursor: default;}
+*:first-child+html a.mceButtonNormal, *:first-child+html a.mceButtonSelected {border: 1px solid #F0F0EE !important; cursor: default;}
+*:first-child+html a.mceButtonSelected {border: 1px solid #6779AA !important; background-color: #D4D5D8;}
+*:first-child+html a.mceButtonNormal:hover, *:first-child+html a.mceButtonSelected:hover {border: 1px solid #0A246A !important; background-color: #B6BDD2; cursor: default;}
 *:first-child+html .mceSelectList {margin-top: 2px;}
 *:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative;  left: 0;  top: 0;}
 *:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative;  top: 1px;}
 *:first-child+html a.mceMoreColors {width: 132px;}
 *:first-child+html .mceColors td a {width: 10px;  height: 10px;}
 *:first-child+html .mceColorPreview {margin: 0; padding-left: 4px;  margin-top: 14px; width: 14px;}
+*:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
+*:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative; top: 1px;}
+*:first-child+html a.mceMoreColors {width: 137px;}
+*:first-child+html .mceColors td a {width: 10px; height: 10px;}
+*:first-child+html .mceColorPreview {margin: 0; padding-left: 4px; margin-top: 14px; width: 14px;}

tags/2.2/wp-includes/js/tinymce/themes/advanced/editor_template.js

-                      r5468
+                      r5480
 /**
  * $Id: editor_template_src.js 129 2006-10-23 09:45:17Z spocke $
+ * $Id: editor_template_src.js 218 2007-02-13 11:08:01Z spocke $
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */
 …
         ['sup', 'sup.gif', 'lang_theme_sup_desc', 'superscript'],
         ['forecolor', 'forecolor.gif', 'lang_theme_forecolor_desc', 'forecolor', true],
+        ['forecolorpicker', 'forecolor.gif', 'lang_theme_forecolor_desc', 'forecolorpicker', true],
         ['backcolor', 'backcolor.gif', 'lang_theme_backcolor_desc', 'HiliteColor', true],
+        ['backcolorpicker', 'backcolor.gif', 'lang_theme_backcolor_desc', 'backcolorpicker', true],
         ['charmap', 'charmap.gif', 'lang_theme_charmap_desc', 'mceCharMap'],
         ['visualaid', 'visualaid.gif', 'lang_theme_visualaid_desc', 'mceToggleVisualAid'],
 …
                 return false;
+            case "forecolorpicker":
+                this._pickColor(editor_id, 'forecolor');
+                return true;
             case "forecolorMenu":
                 TinyMCE_AdvancedTheme._hideMenus(editor_id);
 …
                 ml.show();
             return true;
+            case "backcolorpicker":
+                this._pickColor(editor_id, 'HiliteColor');
+                return true;
             case "mceColorPicker":
                 if (user_interface) {
+                    var template = new Array();
+                    var inputColor = value['document'].getElementById(value['element_id']).value;
+                    var template = [];
+                    if (!value['callback'] && !value['color'])
+                        value['color'] = value['document'].getElementById(value['element_id']).value;
                     template['file'] = 'color_picker.htm';
                     template['width'] = 220;
                     template['height'] = 190;
+                    template['width'] = 380;
+                    template['height'] = 250;
                     template['close_previous'] = "no";
 …
                     tinyMCE.lastColorPickerValue = value;
                     tinyMCE.openWindow(template, {editor_id : editor_id, mce_store_selection : value['store_selection'], inline : "yes", command : "mceColorPicker", input_color : inputColor});
+                    tinyMCE.openWindow(template, {editor_id : editor_id, mce_store_selection : value['store_selection'], inline : "yes", command : "mceColorPicker", input_color : value['color']});
                 } else {
+                    var savedVal = tinyMCE.lastColorPickerValue;
+                    var elm = savedVal['document'].getElementById(savedVal['element_id']);
+                    var savedVal = tinyMCE.lastColorPickerValue, elm;
+                    if (savedVal['callback']) {
+                        savedVal['callback'](value);
+                        return true;
+                    }
+                    elm = savedVal['document'].getElementById(savedVal['element_id']);
                     elm.value = value;
 …
                 template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width_style};height:{$height_style}"><tbody>';
+                if (toolbarLocation == "top") {
+                    template['html'] += '<tr><td class="mceToolbarTop" align="' + toolbarAlign + '" height="1" nowrap="nowrap"><span id="' + editorId + '_toolbar" class="mceToolbarContainer">' + toolbarHTML + '</span></td></tr>';
+                }
+                if (toolbarLocation == "top")
+                    template['html'] += '<tr><td dir="ltr" class="mceToolbarTop" align="' + toolbarAlign + '" height="1" nowrap="nowrap"><span id="' + editorId + '_toolbar" class="mceToolbarContainer">' + toolbarHTML + '</span></td></tr>';
                 if (statusbarLocation == "top") {
 …
                 template['html'] += '<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';
+                if (toolbarLocation == "bottom") {
+                    template['html'] += '<tr><td class="mceToolbarBottom" align="' + toolbarAlign + '" height="1"><span id="' + editorId + '_toolbar" class="mceToolbarContainer">' + toolbarHTML + '</span></td></tr>';
+                }
+                if (toolbarLocation == "bottom")
+                    template['html'] += '<tr><td dir="ltr" class="mceToolbarBottom" align="' + toolbarAlign + '" height="1"><span id="' + editorId + '_toolbar" class="mceToolbarContainer">' + toolbarHTML + '</span></td></tr>';
                 // External toolbar changes
 …
         template['html'] = tinyMCE.replaceVar(template['html'], 'style_select_options', styleSelectHTML);
+        template['delta_width'] = 0;
+        template['delta_height'] = deltaHeight;
+        // Set to default values
+        if (!template['delta_width'])
+            template['delta_width'] = 0;
+        if (!template['delta_height'])
+            template['delta_height'] = deltaHeight;
         return template;
 …
     },
+    removeInstance : function(inst) {
+        new TinyMCE_Layer(inst.editorId + '_fcMenu').remove();
+        new TinyMCE_Layer(inst.editorId + '_bcMenu').remove();
+    },
+    hideInstance : function(inst) {
+        TinyMCE_AdvancedTheme._hideMenus(inst.editorId);
+    },
     _handleMenuEvent : function(e) {
         var te = tinyMCE.isMSIE ? window.event.srcElement : e.target;
 …
             return false;
-        };
-        function getAttrib(elm, name) {
-            return elm.getAttribute(name) ? elm.getAttribute(name) : "";
         };
 …
                     if (st != "") {
                         st = tinyMCE.serializeStyle(tinyMCE.parseStyle(st));
                         nodeData += "style: " + st + " ";
+                        nodeData += "style: " + tinyMCE.xmlEncode(st) + " ";
+                    }
+                }
 …
                     var face = tinyMCE.getAttrib(path[i], "face");
                     if (face != "")
                         nodeData += "font: " + face + " ";
+                        nodeData += "font: " + tinyMCE.xmlEncode(face) + " ";
                     var size = tinyMCE.getAttrib(path[i], "size");
                     if (size != "")
                         nodeData += "size: " + size + " ";
+                        nodeData += "size: " + tinyMCE.xmlEncode(size) + " ";
                     var color = tinyMCE.getAttrib(path[i], "color");
                     if (color != "")
                         nodeData += "color: " + color + " ";
+                }
                 if (getAttrib(path[i], 'id') != "") {
+                        nodeData += "color: " + tinyMCE.xmlEncode(color) + " ";
+                }
+                if (tinyMCE.getAttrib(path[i], 'id') != "") {
                     nodeData += "id: " + path[i].getAttribute('id') + " ";
+                }
 …
                     nodeData += "class: " + className + " ";
                 if (getAttrib(path[i], 'src') != "") {
+                if (tinyMCE.getAttrib(path[i], 'src') != "") {
                     var src = tinyMCE.getAttrib(path[i], "mce_src");
 …
                          src = tinyMCE.getAttrib(path[i], "src");
                     nodeData += "src: " + src + " ";
+                }
                 if (path[i].nodeName == 'A' && getAttrib(path[i], 'href') != "") {
+                    nodeData += "src: " + tinyMCE.xmlEncode(src) + " ";
+                }
+                if (path[i].nodeName == 'A' && tinyMCE.getAttrib(path[i], 'href') != "") {
                     var href = tinyMCE.getAttrib(path[i], "mce_href");
 …
                          href = tinyMCE.getAttrib(path[i], "href");
                     nodeData += "href: " + href + " ";
+                    nodeData += "href: " + tinyMCE.xmlEncode(href) + " ";
+                }
 …
                 if (nodeName == "a" && (anchor = tinyMCE.getAttrib(path[i], "name")) != "") {
                     nodeName = "a";
                     nodeName += "#" + anchor;
+                    nodeName += "#" + tinyMCE.xmlEncode(anchor);
                     nodeData = "";
+                }
                 if (getAttrib(path[i], 'name').indexOf("mce_") != 0) {
+                if (tinyMCE.getAttrib(path[i], 'name').indexOf("mce_") != 0) {
                     var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(path[i], "class"), false);
                     if (className != "" && className.indexOf('mceItem') == -1) {
 …
                 case "IMG":
                 if (getAttrib(node, 'name').indexOf('mce_') != 0 && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
+                if (tinyMCE.getAttrib(node, 'name').indexOf('mce_') != 0 && tinyMCE.getAttrib(node, 'class').indexOf('mceItem') == -1) {
                     tinyMCE.switchClass(editor_id + '_image', 'mceButtonSelected');
+                }
 …
             tableElm.style.width = w + "px";
+        if ( !tinyMCE.isMSIE || tinyMCE.isMSIE7 || tinyMCE.isOpera ) // WordPress: do this later to avoid creeping toolbar bug in MSIE6
         tableElm.style.height = h + "px";
 …
         ih = ih < 1 ? 30 : ih;
+/* WordPress found that this led to a shrinking editor with every resize. (Gray background creeps in 1px at a time.)
         if (tinyMCE.isGecko) {
             iw -= 2;
             ih -= 2;
+        }
+*/
         if (set_w)
 …
+            }
+        }
+        tableElm.style.height = h + "px"; // WordPress: see above
         // Remove pesky table controls
 …
         h += '</tr></table>';
+        /*
         h += '<a href="" class="mceMoreColors">More colors</a>';
         */
+        if (tinyMCE.getParam("theme_advanced_more_colors", true))
+            h += '<a href="#" onclick="TinyMCE_AdvancedTheme._pickColor(\'' + id + '\',\'' + cm + '\');" class="mceMoreColors">' + tinyMCE.getLang('lang_more_colors') + '</a>';
         return h;
+    },
+    _pickColor : function(id, cm) {
+        var inputColor, inst = tinyMCE.selectedInstance;
+        if (cm == 'forecolor' && inst)
+            inputColor = inst.foreColor;
+        if ((cm == 'backcolor' || cm == 'HiliteColor') && inst)
+            inputColor = inst.backColor;
+        tinyMCE.execCommand('mceColorPicker', true, {color : inputColor, callback : function(c) {
+            tinyMCE.execInstanceCommand(id, cm, false, c);
+        }});
     },

tags/2.2/wp-includes/js/tinymce/themes/advanced/jscripts/color_picker.js

-                      r5468
+                      r5480
+function init() {
+    if (tinyMCE.isMSIE)
+        tinyMCEPopup.resizeToInnerSize();
+}
+function selectColor() {
+    var color = document.getElementById("selectedColorBox").value;
+    tinyMCEPopup.execCommand(tinyMCE.getWindowArg('command'), false, color);
+    tinyMCEPopup.close();
+}
+function showColor(color) {
+    document.getElementById("selectedColor").style.backgroundColor = color;
+    document.getElementById("selectedColorBox").value = color;
+}
+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
 var colors = new Array(
 …
 );
+var named = {
+    '#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+    '#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
+    '#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
+    '#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
+    '#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
+    '#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
+    '#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
+    '#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
+    '#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
+    '#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
+    '#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
+    '#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
+    '#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
+    '#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+    '#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
+    '#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
+    '#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
+    '#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
+    '#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
+    '#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
+    '#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
+    '#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+    '#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
+};
+function init() {
+    var inputColor = convertRGBToHex(tinyMCE.getWindowArg('input_color'));
+    if (tinyMCE.isMSIE)
+        tinyMCEPopup.resizeToInnerSize();
+    generatePicker();
+    if (inputColor) {
+        changeFinalColor(inputColor);
+        col = convertHexToRGB(inputColor);
+        if (col)
+            updateLight(col.r, col.g, col.b);
+    }
+}
+function insertAction() {
+    var color = document.getElementById("color").value;
+    tinyMCEPopup.execCommand(tinyMCE.getWindowArg('command'), false, color);
+    tinyMCEPopup.close();
+}
+function showColor(color, name) {
+    if (name)
+        document.getElementById("colorname").innerHTML = name;
+    document.getElementById("preview").style.backgroundColor = color;
+    document.getElementById("color").value = color;
+}
 function convertRGBToHex(col) {
     var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+    if (!col)
+        return col;
     var rgb = col.replace(re, "$1,$2,$3").split(',');
 …
         b = parseInt(col.substring(4, 6), 16);
+        return "rgb(" + r + "," + g + "," + b + ")";
+    }
+    return col;
+}
+function renderColorMap() {
+    var html = "";
+    var inputColor = convertRGBToHex(tinyMCE.getWindowArg('input_color'));
+    html += '<table border="0" cellspacing="1" cellpadding="0">'
+        return {r : r, g : g, b : b};
+    }
+    return null;
+}
+function generatePicker() {
+    var el = document.getElementById('light'), h = '', i;
+    for (i = 0; i < detail; i++){
+        h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
+        + ' onclick="changeFinalColor(this.style.backgroundColor)"'
+        + ' onmousedown="isMouseDown = true; return false;"'
+        + ' onmouseup="isMouseDown = false;"'
+        + ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
+        + ' onmouseover="isMouseOver = true;"'
+        + ' onmouseout="isMouseOver = false;"'
+        + '></div>';
+    }
+    el.innerHTML = h;
+}
+function generateWebColors() {
+    var el = document.getElementById('webcolors'), h = '', i;
+    if (el.className == 'generated')
+        return;
+    h += '<table border="0" cellspacing="1" cellpadding="0">'
         + '<tr>';
+    for (var i=0; i<colors.length; i++) {
+        html += '<td bgcolor="' + colors[i] + '">'
+    for (i=0; i<colors.length; i++) {
+        h += '<td bgcolor="' + colors[i] + '">'
             + '<a href="javascript:selectColor();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');">'
             + '<img border="0" src="images/spacer.gif" width="10" height="10" title="' + colors[i] +  '" alt="' + colors[i] +  '" /></a></td>';
         if ((i+1) % 18 == 0)
+            html += '</tr><tr>';
+    }
+    html += '<tr><td colspan="18">'
+        + '<table width="100%" border="0" cellspacing="0" cellpadding="0">'
+        + '<tr><td>'
+        + '<img id="selectedColor" style="background-color:' + tinyMCE.getWindowArg('input_color') + '" border="0" src="images/spacer.gif" width="80" height="16" />'
+        + '</td><td align="right">'
+        + '<input id="selectedColorBox" name="selectedColorBox" type="text" size="7" maxlength="7" style="width:65px" value="' + inputColor + '" />'
+        + '</td></tr>'
+        + '</table>'
+        + '<div style="float: left"><input type="button" id="insert" name="insert" value="{$lang_theme_colorpicker_apply}" style="margin-top:3px" onclick="selectColor();"></div>'
+        + '<div style="float: right"><input type="button" name="cancel" value="{$lang_cancel}" style="margin-top:3px" onclick="tinyMCEPopup.close();" id="cancel" /></div>'
+        + '</td></tr>'
+        + '</table>';
+    document.write(html);
+}
+            h += '</tr><tr>';
+    }
+    h += '</table>';
+    el.innerHTML = h;
+    el.className = 'generated';
+}
+function generateNamedColors() {
+    var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
+    if (el.className == 'generated')
+        return;
+    for (n in named) {
+        v = named[n];
+        h += '<a href="javascript:selectColor();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
+    }
+    el.innerHTML = h;
+    el.className = 'generated';
+}
+function selectColor() {
+    var color = document.getElementById("color").value;
+    if(window.opener)
+        window.opener.tinyMCE.execInstanceCommand(tinyMCE.getWindowArg('editor_id'),tinyMCE.getWindowArg('command'),false,color);
+    window.close();
+}
+function dechex(n) {
+    return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
+}
+function computeColor(e) {
+    var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;
+    x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
+    y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);
+    partWidth = document.getElementById('colorpicker').width / 6;
+    partDetail = detail / 2;
+    imHeight = document.getElementById('colorpicker').height;
+    r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
+    g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255 + (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
+    b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
+    coef = (imHeight - y) / imHeight;
+    r = 128 + (r - 128) * coef;
+    g = 128 + (g - 128) * coef;
+    b = 128 + (b - 128) * coef;
+    changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
+    updateLight(r, g, b);
+}
+function updateLight(r, g, b) {
+    var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
+    for (i=0; i<detail; i++) {
+        if ((i>=0) && (i<partDetail)) {
+            finalCoef = i / partDetail;
+            finalR = dechex(255 - (255 - r) * finalCoef);
+            finalG = dechex(255 - (255 - g) * finalCoef);
+            finalB = dechex(255 - (255 - b) * finalCoef);
+        } else {
+            finalCoef = 2 - i / partDetail;
+            finalR = dechex(r * finalCoef);
+            finalG = dechex(g * finalCoef);
+            finalB = dechex(b * finalCoef);
+        }
+        color = finalR + finalG + finalB;
+        document.getElementById('gs' + i).style.backgroundColor = '#'+color;
+    }
+}
+function changeFinalColor(color) {
+    if (color.indexOf('#') == -1)
+        color = convertRGBToHex(color);
+    document.getElementById('preview').style.backgroundColor = color;
+    document.getElementById('color').value = color;
+}
+window.focus();

tags/2.2/wp-includes/js/tinymce/themes/advanced/jscripts/link.js

-                      r5468
+                      r5480
     document.forms[0].href.value = tinyMCE.getWindowArg('href') || 'http://';
     document.forms[0].href.select();
+    document.forms[0].href.focus();
     document.forms[0].linktitle.value = tinyMCE.getWindowArg('title');
     document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true);
 …
     var style_class = document.forms[0].styleSelect ? document.forms[0].styleSelect.value : "";
     var dummy;
     // Make anchors absolute
+    // WordPress: Make anchors absolute;
     if (href.charAt(0) == '#')
         href = tinyMCE.settings['document_base_url'] + href;

tags/2.2/wp-includes/js/tinymce/themes/advanced/jscripts/source_editor.js

-                      r5468
+                      r5480
     s.wrap = val;
     if (tinyMCE.isGecko) {
+    if (tinyMCE.isGecko || tinyMCE.isOpera) {
         var v = s.value;
         var n = s.cloneNode(false);
 …
     if (!tinyMCE.isMSIE) {
          wHeight = self.innerHeight-80;
          wWidth = self.innerWidth-16;
+         wHeight = self.innerHeight - 60;
+         wWidth = self.innerWidth - 16;
     } else {
          wHeight = document.body.clientHeight - 80;
+         wHeight = document.body.clientHeight - 60;
          wWidth = document.body.clientWidth - 16;
+    }
 …
     el.style.width  = Math.abs(wWidth) + 'px';
+}

tags/2.2/wp-includes/js/tinymce/themes/advanced/langs/en.js

-                      r5468
+                      r5480
 close : 'Close',
 toolbar_focus : 'Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X',
+invalid_data : 'Error: Invalid values entered, these are marked in red.'
+invalid_data : 'Error: Invalid values entered, these are marked in red.',
+more_colors : 'More colors',
+color_picker_tab : 'Picker',
+color_picker : 'Color picker',
+web_colors_tab : 'Web safe',
+web_colors : 'Web safe colors',
+named_colors_tab : 'Named',
+named_colors : 'Named colors',
+color : 'Color:',
+color_name : 'Name:'
 });

tags/2.2/wp-includes/js/tinymce/tiny_mce.js

-                      r5468
+                      r5480
     this.majorVersion = "2";
     this.minorVersion = "0.8";
     this.releaseDate = "2006-10-23";
+    this.minorVersion = "1.0";
+    this.releaseDate = "2007-02-13";
     this.instances = new Array();
 …
         this._def("convert_on_click", false);
         this._def("content_css", '');
         this._def("fix_list_elements", false);
+        this._def("fix_list_elements", true);
         this._def("fix_table_elements", false);
         this._def("strict_loading_mode", document.contentType == 'application/xhtml+xml');
 …
         this._def("display_tab_class", '');
         this._def("gecko_spellcheck", false);
+        this._def("hide_selects_on_submit", true);
         // Force strict loading mode to false on non Gecko browsers
 …
         this.blockRegExp = new RegExp("^(" + this.blockElms + ")$", "i");
         this.posKeyCodes = new Array(13,45,36,35,33,34,37,38,39,40);
         this.uniqueURL = 'javascript:TINYMCE_UNIQUEURL();'; // Make unique URL non real URL
+        this.uniqueURL = 'javascript:void(091039730);'; // Make unique URL non real URL
         this.uniqueTag = '<div id="mceTMPElement" style="display: none">TMP</div>';
         this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup');
+        this.callbacks = new Array('onInit', 'getInfo', 'getEditorTemplate', 'setupContent', 'onChange', 'onPageLoad', 'handleNodeChange', 'initInstance', 'execCommand', 'getControlHTML', 'handleEvent', 'cleanup', 'removeInstance');
         // Theme url
 …
+            }
+        }
+        // Setup XML encoding regexps
+        this.xmlEncodeAposRe = new RegExp('[<>&"\']', 'g');
+        this.xmlEncodeRe = new RegExp('[<>&"]', 'g');
+//      this.xmlEncodeEnts = {'&':'&amp;','"':'&quot;',"'":'&#39;','<':'&lt;','>':'&gt;'};
     },
 …
         tinyMCE.undoIndex = n.length;
+        // Dispatch remove instance call
+        tinyMCE.dispatchCallback(ti, 'remove_instance_callback', 'removeInstance', ti);
         return ti;
     },
 …
             case "mceRemoveEditor":
                 tinyMCE.removeMCEControl(value);
+                return;
+            case "mceToggleEditor":
+                var inst = tinyMCE.getInstanceById(value), pe, te;
+                if (inst) {
+                    pe = document.getElementById(inst.editorId + '_parent');
+                    te = inst.oldTargetElement;
+                    if (typeof(inst.enabled) == 'undefined')
+                        inst.enabled = true;
+                    inst.enabled = !inst.enabled;
+                    if (!inst.enabled) {
+                        pe.style.display = 'none';
+                        te.value = inst.getHTML();
+                        te.style.display = inst.oldTargetDisplay;
+                        tinyMCE.dispatchCallback(inst, 'hide_instance_callback', 'hideInstance', inst);
+                    } else {
+                        pe.style.display = 'block';
+                        te.style.display = 'none';
+                        inst.setHTML(te.value);
+                        inst.useCSS = false;
+                        tinyMCE.dispatchCallback(inst, 'show_instance_callback', 'showInstance', inst);
+                    }
+                } else
+                    tinyMCE.addMCEControl(tinyMCE._getElementById(value), value);
                 return;
 …
+        }
+        tinyMCE.selectedInstance = inst;
         inst.switchSettings();
 …
         //inst.getDoc().designMode = inst.getDoc().designMode;
-        // Setup element references
-        var parentElm = inst.targetDoc.getElementById(inst.editorId + '_parent');
-        inst.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling;
         tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual'], inst);
         tinyMCE.dispatchCallback(inst, 'setupcontent_callback', 'setupContent', editor_id, inst.getBody(), inst.getDoc());
 …
     storeAwayURLs : function(s) {
         // Remove all mce_src, mce_href and replace them with new ones
     //  s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
     //  s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+        // s = s.replace(new RegExp('mce_src\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
+        // s = s.replace(new RegExp('mce_href\\s*=\\s*\"[^ >\"]*\"', 'gi'), '');
         if (!s.match(/(mce_src|mce_href)/gi, s)) {
 …
     },
+    removeTinyMCEFormElements : function(form_obj) {
+        var i, elementId;
+        // Skip form element removal
+        if (!tinyMCE.getParam('hide_selects_on_submit'))
+            return;
+        // Check if form is valid
+        if (typeof(form_obj) == "undefined" || form_obj == null)
+            return;
+        // If not a form, find the form
+        if (form_obj.nodeName != "FORM") {
+            if (form_obj.form)
+                form_obj = form_obj.form;
+            else
+                form_obj = tinyMCE.getParentElement(form_obj, "form");
+        }
+        // Still nothing
+        if (form_obj == null)
+            return;
+        // Disable all UI form elements that TinyMCE created
+        for (i=0; i<form_obj.elements.length; i++) {
+            elementId = form_obj.elements[i].name ? form_obj.elements[i].name : form_obj.elements[i].id;
+            if (elementId.indexOf('mce_editor_') == 0)
+                form_obj.elements[i].disabled = true;
+        }
+    },
     handleEvent : function(e) {
         var inst = tinyMCE.selectedInstance;
 …
             case "submit":
+                tinyMCE.removeTinyMCEFormElements(tinyMCE.isMSIE ? window.event.srcElement : e.target);
                 tinyMCE.triggerSave();
                 tinyMCE.isNotDirty = true;
 …
         } else {
             if (tinyMCE.isRealIE)
                 h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton" onmouseover="tinyMCE._menuButtonEvent(\'over\',this);tinyMCE.lastHover = this;" onmouseout="tinyMCE._menuButtonEvent(\'out\',this);">';
+                h += '<span id="{$editor_id}_' + id + '" dir="ltr" class="mceMenuButton" onmouseover="tinyMCE._menuButtonEvent(\'over\',this);tinyMCE.lastHover = this;" onmouseout="tinyMCE._menuButtonEvent(\'out\',this);">';
             else
                 h += '<span id="{$editor_id}_' + id + '" class="mceMenuButton">';
+                h += '<span id="{$editor_id}_' + id + '" dir="ltr" class="mceMenuButton">';
             h += '<a href="javascript:' + cmd + '" onclick="' + cmd + 'return false;" onmousedown="return false;" class="mceMenuButtonNormal" target="_self">';
 …
     submitPatch : function() {
+        tinyMCE.removeTinyMCEFormElements(this);
         tinyMCE.triggerSave();
         tinyMCE.isNotDirty = true;
 …
     triggerNodeChange : function(focus, setup_content) {
+        var elm, inst, editorId, undoIndex = -1, undoLevels = -1, doc, anySelection = false, st;
         if (tinyMCE.selectedInstance) {
+            var inst = tinyMCE.selectedInstance;
+            var editorId = inst.editorId;
+            var elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
+            var undoIndex = -1, doc;
+            var undoLevels = -1;
+            var anySelection = false;
+            var selectedText = inst.selection.getSelectedText();
+            inst = tinyMCE.selectedInstance;
+            elm = (typeof(setup_content) != "undefined" && setup_content) ? tinyMCE.selectedElement : inst.getFocusElement();
+/*          if (elm == inst.lastTriggerEl)
+                return;
+            inst.lastTriggerEl = elm;*/
+            editorId = inst.editorId;
+            st = inst.selection.getSelectedText();
             if (tinyMCE.settings.auto_resize)
 …
             if (tinyMCE.selectedElement)
                 anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == "img") || (selectedText && selectedText.length > 0);
+                anySelection = (tinyMCE.selectedElement.nodeName.toLowerCase() == "img") || (st && st.length > 0);
             if (tinyMCE.settings['custom_undo_redo']) {
 …
     openWindow : function(template, args) {
         var html, width, height, x, y, resizable, scrollbars, url;
+        args = !args ? {} : args;
         args['mce_template_file'] = template['file'];
 …
     getCSSClasses : function(editor_id, doc) {
         var output = new Array();
+        var inst = tinyMCE.getInstanceById(editor_id);
         // Is cached, use that
         if (typeof(tinyMCE.cssClasses) != "undefined")
             return tinyMCE.cssClasses;
+        if (inst && inst.cssClasses.length > 0)
+            return inst.cssClasses;
         if (typeof(editor_id) == "undefined" && typeof(doc) == "undefined") {
 …
                                     var addClass = true;
                                     for (var p=0; p<output.length && addClass; p++) {
                                         if (output[p] == cssClass)
+                                    for (var p=0; p<inst.cssClasses.length && addClass; p++) {
+                                        if (inst.cssClasses[p] == cssClass)
                                             addClass = false;
+                                    }
                                     if (addClass)
                                         output[output.length] = cssClass;
+                                        inst.cssClasses[inst.cssClasses.length] = cssClass;
+                                }
+                            }
 …
+        }
+        // Cache em
+        if (output.length > 0)
+            tinyMCE.cssClasses = output;
+        return output;
+        return inst.cssClasses;
     },
 …
     getControlHTML : function(c) {
         var i, l, n, o, v;
+        var i, l, n, o, v, rtl = tinyMCE.getLang('lang_dir') == 'rtl';
         l = tinyMCE.plugins;
 …
             o = l[n];
+            if (o.getControlHTML && (v = o.getControlHTML(c)) != '')
+            if (o.getControlHTML && (v = o.getControlHTML(c)) != '') {
+                if (rtl)
+                    return '<span dir="rtl">' + tinyMCE.replaceVar(v, "pluginurl", o.baseURL) + '</span>';
                 return tinyMCE.replaceVar(v, "pluginurl", o.baseURL);
+            }
+        }
         o = tinyMCE.themes[tinyMCE.settings['theme']];
+        if (o.getControlHTML && (v = o.getControlHTML(c)) != '')
+        if (o.getControlHTML && (v = o.getControlHTML(c)) != '') {
+            if (rtl)
+                return '<span dir="rtl">' + v + '</span>';
             return v;
+        }
         return '';
 …
     evalFunc : function(f, idx, a, o) {
+        var s = '(', i;
+        for (i=idx; i<a.length; i++) {
+            s += 'a[' + i + ']';
+            if (i < a.length-1)
+                s += ',';
+        }
+        s += ');';
+        return o ? eval("o." + f + s) : eval("f" + s);
+        o = !o ? window : o;
+        f = typeof(f) == 'function' ? f : o[f];
+        return f.apply(o, Array.prototype.slice.call(a, idx));
     },
 …
         l = tinyMCE.getParam(p, '');
         if (l != '' && (v = tinyMCE.evalFunc(typeof(l) == "function" ? l : eval(l), 3, a)) == s && m > 0)
+        if (l != '' && (v = tinyMCE.evalFunc(l, 3, a)) == s && m > 0)
             return true;
 …
     },
     xmlEncode : function(s) {
         return s ? ('' + s).replace(new RegExp('[<>&"\']', 'g'), function (c, b) {
+    xmlEncode : function(s, skip_apos) {
+        return s ? ('' + s).replace(!skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe, function (c, b) {
             switch (c) {
                 case '&':
 …
     this.foreColor = this.backColor = "#999999";
     this.data = {};
+    this.cssClasses = [];
     this.cleanup.init({
 …
         entity_encoding : s.entity_encoding,
         debug : s.cleanup_debug,
-        url_converter : 'TinyMCE_Cleanup.prototype._urlConverter',
         indent : s.apply_source_formatting,
         invalid_elements : s.invalid_elements,
         verify_html : s.verify_html,
+        fix_content_duplication : s.fix_content_duplication
+        fix_content_duplication : s.fix_content_duplication,
+        convert_fonts_to_spans : s.convert_fonts_to_spans
     });
 …
     handleShortcut : function(e) {
+        var i, s = this.shortcuts, o;
+        var i, s, o;
+        // Normal key press, then ignore it
+        if (!e.altKey && !e.ctrlKey)
+            return false;
+        s = this.shortcuts;
         for (i=0; i<s.length; i++) {
 …
         this.contentDocument = doc; // <-- Strange, unless this is applied Mozilla 1.3 breaks
+        if (tinyMCE.execCommandCallback(this, 'execcommand_callback', 'execCommand', this.editorId, this.getBody(), command, user_interface, value))
+            return;
+        // Don't dispatch key commands
+        if (!/mceStartTyping|mceEndTyping/.test(command)) {
+            if (tinyMCE.execCommandCallback(this, 'execcommand_callback', 'execCommand', this.editorId, this.getBody(), command, user_interface, value))
+                return;
+        }
         // Fix align on images
 …
                     focusElm = tinyMCE.getParentElement(focusElm, 'A');
                     if (focusElm && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length)
+                    if (focusElm)
                         this.selection.selectNode(focusElm, false);
+                }
 …
                 return true;
-            case "FormatBlock":
-                if (!this.cleanup.isValid(value))
-                    return true;
-                this.getDoc().execCommand(command, user_interface, value);
-                tinyMCE.triggerNodeChange();
-                break;
             case "InsertUnorderedList":
 …
                         this.execCommand("mceRemoveNode", false, elm);
                 } else {
+                    if (!this.cleanup.isValid(value))
+                        return true;
                     if (tinyMCE.isGecko && new RegExp('<(div|blockquote|code|dt|dd|dl|samp)>', 'gi').test(value))
                         value = value.replace(/[^a-z]/gi, '');
 …
                 break;
+            case "mceSetStyleInfo":
             case "SetStyleInfo":
                 var rng = this.getRng();
 …
             case "mceSetCSSClass":
                 this.execCommand("SetStyleInfo", false, {command : "setattrib", name : "class", value : value});
+                this.execCommand("mceSetStyleInfo", false, {command : "setattrib", name : "class", value : value});
             break;
 …
                 break;
+            case "RemoveFormat":
             case "removeformat":
                 var text = this.selection.getSelectedText();
 …
+                    }
                     this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+                    this.execCommand("mceSetStyleInfo", false, {command : "removeformat"});
                 } else {
                     this.getDoc().execCommand(command, user_interface, value);
                     this.execCommand("SetStyleInfo", false, {command : "removeformat"});
+                    this.execCommand("mceSetStyleInfo", false, {command : "removeformat"});
+                }
 …
             } else {
                 hc = '<input type="hidden" id="' + form_element_name + '" name="' + form_element_name + '" />';
+                this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline');
                 this.oldTargetElement.style.display = "none";
+            }
 …
             this.oldTargetElement = replace_element;
+            if (!tinyMCE.settings['debug'])
+            if (!tinyMCE.settings['debug']) {
+                this.oldTargetDisplay = tinyMCE.getStyle(this.oldTargetElement, 'display', 'inline');
                 this.oldTargetElement.style.display = "none";
+            }
             // Output HTML and set editable
 …
         if (tinyMCE.isIE)
             window.setTimeout("tinyMCE.addEventHandlers(tinyMCE.instances[\"" + this.editorId + "\"]);", 1);
+        // Setup element references
+        var parentElm = this.targetDoc.getElementById(this.editorId + '_parent');
+        this.formElement = tinyMCE.isGecko ? parentElm.previousSibling : parentElm.nextSibling;
         tinyMCE.setupContent(this.editorId, true);
 …
                 val = tinyMCE.convertRGBToHex(val, true);
+            val = val.replace(/\"/g, '\'');
             if (val != "url('')")
                 str += key.toLowerCase() + ": " + val + "; ";
 …
     var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
     var h = doc.body.innerHTML;
+    /*var h = doc.body.innerHTML;
     h = h.replace(/<span/gi, '<font');
     h = h.replace(/<\/span/gi, '</font');
     tinyMCE.setInnerHTML(doc.body, h);
     var s = doc.getElementsByTagName("font");
+    tinyMCE.setInnerHTML(doc.body, h);*/
+    var s = tinyMCE.selectElements(doc, 'span,font');
     for (var i=0; i<s.length; i++) {
         var size = tinyMCE.trim(s[i].style.fontSize).toLowerCase();
 …
     var sizes = tinyMCE.getParam('font_size_style_values').replace(/\s+/, '').split(',');
     var h = doc.body.innerHTML;
+/*  var h = doc.body.innerHTML;
     h = h.replace(/<font/gi, '<span');
     h = h.replace(/<\/font/gi, '</span');
     tinyMCE.setInnerHTML(doc.body, h);
+    tinyMCE.setInnerHTML(doc.body, h);*/
     var fsClasses = tinyMCE.getParam('font_size_classes');
 …
         fsClasses = null;
     var s = doc.getElementsByTagName("span");
+    var s = tinyMCE.selectElements(doc, 'span,font');
     for (var i=0; i<s.length; i++) {
         var fSize, fFace, fColor;
 …
         n = nl[i];
         if ((p = tinyMCE.getParentElement(n, 'p,div,h1,h2,h3,h4,h5,h6')) != null) {
+        if ((p = tinyMCE.getParentElement(n, 'p,h1,h2,h3,h4,h5,h6')) != null) {
             np = p.cloneNode(false);
             np.removeAttribute('id');
 …
         this.fillStr = s.entity_encoding == "named" ? "&nbsp;" : "&#160;";
         this.idCount = 0;
+        this.xmlEncodeRe = new RegExp('[\u007F-\uFFFF<>&"]', 'g');
+        this.xmlEncodeAposRe = new RegExp('[\u007F-\uFFFF<>&"\']', 'g');
     },
 …
     isValid : function(n) {
         this._setupRules(); // Will initialize cleanup rules
+        // Empty is true since it removes formatting
+        if (!n)
+            return true;
         // Clean the name up a bit
 …
         var xd, el, i, l, cn, at, no, hc = false;
         if (this._isDuplicate(n))
+        if (tinyMCE.isRealIE && this._isDuplicate(n))
             return;
 …
     serializeNodeAsHTML : function(n, inn) {
         var en, no, h = '', i, l, t, st, r, cn, va = false, f = false, at, hc, cr;
+        var en, no, h = '', i, l, t, st, r, cn, va = false, f = false, at, hc, cr, nn;
         this._setupRules(); // Will initialize cleanup rules
         if (this._isDuplicate(n))
+        if (tinyMCE.isRealIE && this._isDuplicate(n))
             return '';
 …
                     break;
+                if (this.vElementsRe.test(n.nodeName) && (!this.iveRe || !this.iveRe.test(n.nodeName)) && !inn) {
+                nn = n.nodeName;
+                // Convert fonts to spans
+                if (this.settings.convert_fonts_to_spans) {
+                    // On get content FONT -> SPAN
+                    if (this.settings.on_save && nn == 'FONT')
+                        nn = 'SPAN';
+                    // On insert content SPAN -> FONT
+                    if (!this.settings.on_save && nn == 'SPAN')
+                        nn = 'FONT';
+                }
+                if (this.vElementsRe.test(nn) && (!this.iveRe || !this.iveRe.test(nn)) && !inn) {
                     va = true;
                     r = this.rules[n.nodeName];
+                    r = this.rules[nn];
                     if (!r) {
                         at = this.rules;
                         for (no in at) {
                             if (at[no] && at[no].validRe.test(n.nodeName)) {
+                            if (at[no] && at[no].validRe.test(nn)) {
                                 r = at[no];
                                 break;
 …
+                    }
                     en = r.isWild ? n.nodeName.toLowerCase() : r.oTagName;
+                    en = r.isWild ? nn.toLowerCase() : r.oTagName;
                     f = r.fill;
 …
                     // Close these
                     if (t != null && this.closeElementsRe.test(n.nodeName))
+                    if (t != null && this.closeElementsRe.test(nn))
                         return t + ' />';
 …
                         h += t + '>';
                     if (this.isIE && this.codeElementsRe.test(n.nodeName))
+                    if (this.isIE && this.codeElementsRe.test(nn))
                         h += n.innerHTML;
+                }
 …
             av = t;
         if (os && av.length != 0 && this.settings.url_converter.length != 0 && /^(src|href|longdesc)$/.test(an))
             av = eval(this.settings.url_converter + '(this, n, av)');
+        if (os && av.length != 0 && /^(src|href|longdesc)$/.test(an))
+            av = this._urlConverter(this, n, av);
         if (av.length != 0 && r.validAttribValues && r.validAttribValues[an] && !r.validAttribValues[an].test(av))
 …
         if (av.length != 0) {
             if (an.indexOf('on') != 0)
                 av = this.xmlEncode(av);
+                av = this.xmlEncode(av, 1);
             return " " + an + "=" + '"' + av + '"';
 …
     },
     xmlEncode : function(s) {
         var cl = this;
+    xmlEncode : function(s, skip_apos) {
+        var cl = this, re = !skip_apos ? this.xmlEncodeAposRe : this.xmlEncodeRe;
         this._setupEntities(); // Will intialize lookup table
 …
         switch (this.settings.entity_encoding) {
             case "raw":
                 return tinyMCE.xmlEncode(s);
+                return tinyMCE.xmlEncode(s, skip_apos);
             case "named":
                 return s.replace(new RegExp('[\u007F-\uFFFF<>&"\']', 'g'), function (c, b) {
+                return s.replace(re, function (c, b) {
                     b = cl.entities[c.charCodeAt(0)];
 …
             case "numeric":
                 return s.replace(new RegExp('[\u007F-\uFFFF<>&"\']', 'g'), function (c, b) {
+                return s.replace(re, function (c, b) {
                     return b ? '&#' + c.charCodeAt(0) + ';' : c;
                 });
 …
     _getAttrib : function(e, n, d) {
+        var v, ex, nn;
         if (typeof(d) == "undefined")
             d = "";
 …
             return d;
+        var v = e.getAttribute(n, 0);
+        try {
+            v = e.getAttribute(n, 0);
+        } catch (ex) {
+            // IE 7 may cast exception on invalid attributes
+            v = e.getAttribute(n, 2);
+        }
         if (n == "class" && !v)
             v = e.className;
+        if (this.isIE && n == "http-equiv")
+            v = e.httpEquiv;
+        if (this.isIE && e.nodeName == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
+            v = "";
+        if (this.isIE && e.nodeName == "INPUT" && n == "size" && v == "20")
+            v = "";
+        if (this.isIE && e.nodeName == "INPUT" && n == "maxlength" && v == "2147483647")
+            v = "";
+        if (n == "style" && !tinyMCE.isOpera)
+            v = e.style.cssText;
+        if (n == 'style')
+        if (this.isIE) {
+            if (n == "http-equiv")
+                v = e.httpEquiv;
+            nn = e.nodeName;
+            // Skip the default values that IE returns
+            if (nn == "FORM" && n == "enctype" && v == "application/x-www-form-urlencoded")
+                v = "";
+            if (nn == "INPUT" && n == "size" && v == "20")
+                v = "";
+            if (nn == "INPUT" && n == "maxlength" && v == "2147483647")
+                v = "";
+        }
+        if (n == 'style' && v) {
+            if (!tinyMCE.isOpera)
+                v = e.style.cssText;
             v = tinyMCE.serializeStyle(tinyMCE.parseStyle(v));
+        }
         if (this.settings.on_save && n.indexOf('on') != -1 && this.settings.on_save && v && v != "")
 …
         if (!c.settings.on_save)
             return tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings.base_href, v);
+        else if (tinyMCE.getParam('convert_urls'))
+            return eval(tinyMCE.settings.urlconverter_callback + "(v, n, true);");
+        else if (tinyMCE.getParam('convert_urls')) {
+            if (!this.urlConverter)
+                this.urlConverter = eval(tinyMCE.settings.urlconverter_callback);
+            return this.urlConverter(v, n, true);
+        }
         return v;
 …
     // Convert all strong/em to b/i in Gecko
     if (tinyMCE.isGecko) {
+        h = h.replace(/<strong/gi, '<b');
+        h = h.replace(/<em(\/?)/gi, '<i');
+        h = h.replace(/<em /gi, '<i');
+        h = h.replace(/<embed([^>]*)>/gi, '<tmpembed$1>');
+        h = h.replace(/<em([^>]*)>/gi, '<i$1>');
+        h = h.replace(/<tmpembed([^>]*)>/gi, '<embed$1>');
+        h = h.replace(/<strong([^>]*)>/gi, '<b$1>');
         h = h.replace(/<\/strong>/gi, '</b>');
         h = h.replace(/<\/em>/gi, '</i>');
 …
         return dv;
+    v = elm.getAttribute(name);
+    try {
+        v = elm.getAttribute(name, 0);
+    } catch (ex) {
+        // IE 7 may cast exception on invalid attributes
+        v = elm.getAttribute(name, 2);
+    }
     // Try className for class attrib
 …
         height : w.innerHeight || (m ? de.clientHeight : b.clientHeight)
     };
+};
+TinyMCE_Engine.prototype.getStyle = function(n, na, d) {
+    if (!n)
+        return false;
+    // Gecko
+    if (tinyMCE.isGecko && n.ownerDocument.defaultView) {
+        try {
+            return n.ownerDocument.defaultView.getComputedStyle(n, null).getPropertyValue(na);
+        } catch (n) {
+            // Old safari might fail
+            return null;
+        }
+    }
+    // Camelcase it, if needed
+    na = na.replace(/-(\D)/g, function(a, b){
+        return b.toUpperCase();
+    });
+    // IE & Opera
+    if (n.currentStyle)
+        return n.currentStyle[na];
+    return false;
 };
 …
             f(doc, ot[i], tinyMCE.handleEvent);
+        eval('try { doc.designMode = "On"; } catch(e) {}'); // Force designmode
+        // Force designmode
+        try {
+            doc.designMode = "On";
+        } catch (e) {
+            // Ignore
+        }
+    }
 };
 …
         // When editing always use fonts internaly
         if (tinyMCE.getParam("convert_fonts_to_spans"))
             tinyMCE.convertSpansToFonts(inst.getDoc());
+        //if (tinyMCE.getParam("convert_fonts_to_spans"))
+        //  tinyMCE.convertSpansToFonts(inst.getDoc());
         return h;
 …
         if (tinyMCE.isGecko || tinyMCE.isOpera) {
+            if (!sel)
+                return false;
             if (bookmark.rng) {
                 sel.removeAllRanges();
 …
             return '' + window.getSelection();
+        return s.getRangeAt(0);
+        if (s.rangeCount > 0)
+            return s.getRangeAt(0);
+        return null;
+    },
+    isCollapsed : function() {
+        var r = this.getRng();
+        if (r.item)
+            return false;
+        return r.boundingWidth == 0 || this.getSel().isCollapsed;
+    },
+    collapse : function(b) {
+        var r = this.getRng(), s = this.getSel();
+        if (r.select) {
+            r.collapse(b);
+            r.select();
+        } else {
+            if (b)
+                s.collapseToStart();
+            else
+                s.collapseToEnd();
+        }
     },
 …
     show : function() {
+        this.getElement().style.display = 'block';
+        this.updateBlocker();
+        var el = this.getElement();
+        if (el) {
+            el.style.display = 'block';
+            this.updateBlocker();
+        }
     },
     hide : function() {
+        this.getElement().style.display = 'none';
+        this.updateBlocker();
+        var el = this.getElement();
+        if (el) {
+            el.style.display = 'none';
+            this.updateBlocker();
+        }
     },
 …
         return parseInt(s);
+    },
+    remove : function() {
+        var e = this.getElement(), b = this.getBlocker();
+        if (e)
+            e.parentNode.removeChild(e);
+        if (b)
+            b.parentNode.removeChild(b);
+    }
 …
                 default:
                     h += '<tr><td><a href="#" onclick="return tinyMCE.cancelEvent(event);" onmousedown="return tinyMCE.cancelEvent(event);" onmouseup="' + tinyMCE.xmlEncode(m[i].js) + ';return tinyMCE.cancelEvent(event);"><span' + c +'>' + t + '</span></a>';
+                    h += '<tr><td><a href="' + tinyMCE.xmlEncode(m[i].js) + '" onmousedown="' + tinyMCE.xmlEncode(m[i].js) + ';return tinyMCE.cancelEvent(event);" onclick="return tinyMCE.cancelEvent(event);" onmouseup="return tinyMCE.cancelEvent(event);"><span' + c +'>' + t + '</span></a>';
+            }

tags/2.2/wp-includes/js/tinymce/tiny_mce_config.php

-                      r5468
+                      r5480
     $mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
     $mce_browsers = implode($mce_browsers, ',');
     $mce_popups_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/popups.css';
     $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css';
 …
         $mce_popups_css = str_replace('http://', 'https://', $mce_popups_css);
+    }
+    $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower(get_locale());
 ?>
 …
     theme_advanced_buttons2 : "<?php echo $mce_buttons_2; ?>",
     theme_advanced_buttons3 : "<?php echo $mce_buttons_3; ?>",
     language : "<?php echo strtolower(get_locale()); ?>",
+    language : "<?php echo $mce_locale; ?>",
     theme_advanced_toolbar_location : "top",
     theme_advanced_toolbar_align : "left",
 …
     gecko_spellcheck : true,
     entities : "38,amp,60,lt,62,gt",
+    button_tile_map : true,
     content_css : "<?php echo $mce_css; ?>",
     valid_elements : "<?php echo $valid_elements; ?>",

tags/2.2/wp-includes/js/tinymce/tiny_mce_gzip.php

-                      r5468
+                      r5480
 <?php
 /**
+ * $RCSfile: tiny_mce_gzip.php,v $
+ * $Revision: $
+ * $Date: $
+ * $Id: tiny_mce_gzip.php 158 2006-12-21 14:32:19Z spocke $
+ *
- * @version 1.08
  * @author Moxiecode
  * @copyright Copyright  2005-2006, Moxiecode Systems AB, All rights reserved.
 …
  */
+@require_once('../../../wp-config.php');
+// gzip_compression();
+function wp_tinymce_lang($path) {
+    global $language;
+    $text = '';
+    // Look for xx_YY.js, xx_yy.js, xx.js
+    $file = realpath(sprintf($path, $language));
+    if ( file_exists($file) )
+        $text = file_get_contents($file);
+    $file = realpath(sprintf($path, strtolower($language)));
+    if ( file_exists($file) )
+        $text = file_get_contents($file);
+    $file = realpath(sprintf($path, substr($language, 0, 2)));
+    if ( file_exists($file) )
+        $text = file_get_contents($file);
+    // Fall back on en.js
+    $file = realpath(sprintf($path, 'en'));
+    if ( empty($text) && file_exists($file) )
+        $text = file_get_contents($file);
+    // Send lang file through gettext
+    if ( function_exists('__') && strtolower(substr($language, 0, 2)) != 'en' ) {
+        $search1 = "/^tinyMCELang\\[(['\"])(.*)\\1\]( ?= ?)(['\"])(.*)\\4/Uem";
+        $replace1 = "'tinyMCELang[\\1\\2\\1]\\3'.stripslashes('\\4').__('\\5').stripslashes('\\4')";
+        $search2 = "/\\s:\\s(['\"])(.*)\\1(,|\\s*})/Uem";
+        $replace2 = "' : '.stripslashes('\\1').__('\\2').stripslashes('\\1').'\\3'";
+        $search = array($search1, $search2);
+        $replace = array($replace1, $replace2);
+        $text = preg_replace($search, $replace, $text);
+        return $text;
+    }
+    return $text;
+}
+function wp_compact_tinymce_js($text) {
+    // This function was custom-made for TinyMCE 2.0, not expected to work with any other JS.
+    // Strip comments
+    $text = preg_replace("!(^|\s+)//.*$!m", '', $text);
+    $text = preg_replace("!/\*.*?\*/!s", '', $text);
+    // Strip leading tabs, carriage returns and unnecessary line breaks.
+    $text = preg_replace("!^\t+!m", '', $text);
+    $text = str_replace("\r", '', $text);
+    $text = preg_replace("!(^|{|}|;|:|\))\n!m", '\\1', $text);
+    return "$text\n";
+}
+// General options
+$suffix = "";                           // Set to "_src" to use source version
+$expiresOffset = 3600 * 24 * 10;        // 10 days util client cache expires
+$diskCache = false;                     // If you enable this option gzip files will be cached on disk.
+$cacheDir = realpath(".");              // Absolute directory path to where cached gz files will be stored
+$debug = false;                         // Enable this option if you need debuging info
+// Headers
+header("Content-Type: text/javascript; charset=" . get_bloginfo('charset'));
+// header("Cache-Control: must-revalidate");
+header("Vary: Accept-Encoding"); // Handle proxies
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+// Get data to load
+$theme = isset($_GET['theme']) ? TinyMCE_cleanInput($_GET['theme']) : "";
+$language = isset($_GET['language']) ? TinyMCE_cleanInput($_GET['language']) : "";
+$plugins = isset($_GET['plugins']) ? TinyMCE_cleanInput($_GET['plugins']) : "";
+$lang = isset($_GET['lang']) ? TinyMCE_cleanInput($_GET['lang']) : "en";
+$index = isset($_GET['index']) ? TinyMCE_cleanInput($_GET['index']) : -1;
+$cacheKey = md5($theme . $language . $plugins . $lang . $index . $debug);
+$cacheFile = $cacheDir == "" ? "" : $cacheDir . "/" . "tinymce_" .  $cacheKey . ".gz";
+$cacheData = "";
+// Patch older versions of PHP < 4.3.0
+if (!function_exists('file_get_contents')) {
+    function file_get_contents($filename) {
+        $fd = fopen($filename, 'rb');
+        $content = fread($fd, filesize($filename));
+        fclose($fd);
+        return $content;
+    }
+}
+// Security check function, can only contain a-z 0-9 , _ - and whitespace.
+function TinyMCE_cleanInput($str) {
+    return preg_replace("/[^0-9a-z\-_,]+/i", "", $str); // Remove anything but 0-9,a-z,-_
+}
+function TinyMCE_echo($str) {
+    global $cacheData, $diskCache;
+    if ($diskCache)
+        $cacheData .= $str;
+    else
+        echo $str;
+}
+// Only gzip the contents if clients and server support it
+$encodings = array();
+if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+    $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+// Check for gzip header or northon internet securities
+if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
+    $enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+    // Use cached file if it exists but not in debug mode
+    if (file_exists($cacheFile) && !$debug) {
+        header("Content-Encoding: " . $enc);
+        echo file_get_contents($cacheFile);
+        die;
+    }
+    if (!$diskCache)
+        ob_start("ob_gzhandler");
+} else
+    @require_once('../../../wp-config.php');  // For get_bloginfo().
+    // Get input
+    $plugins = explode(',', getParam("plugins", ""));
+    $languages = explode(',', getParam("languages", ""));
+    $themes = explode(',', getParam("themes", ""));
+    $diskCache = getParam("diskcache", "") == "true";
+    $isJS = getParam("js", "") == "true";
+    $compress = getParam("compress", "true") == "true";
+    $suffix = getParam("suffix", "_src") == "_src" ? "_src" : "";
+    $cachePath = realpath("."); // Cache path, this is where the .gz files will be stored
+    $expiresOffset = 3600 * 24 * 10; // Cache for 10 days in browser cache
+    $content = "";
+    $encodings = array();
+    $supportsGzip = false;
+    $enc = "";
+    $cacheKey = "";
+    // Custom extra javascripts to pack
+    $custom = array(/*
+        "some custom .js file",
+        "some custom .js file"
+    */);
+    // WP
+    $index = getParam("index", -1);
+    $theme = getParam("theme", "");
+    $themes = array($theme);
+    $language = getParam("language", "en");
+    if ( empty($language) )
+        $language = 'en';
+    $languages = array($language);
+    if ( $language != strtolower($language) )
+        $languages[] = strtolower($language);
+    if ( $language != substr($language, 0, 2) )
+        $languages[] = substr($language, 0, 2);
     $diskCache = false;
+    $isJS = true;
+    $suffix = '';
+    // Headers
+    header("Content-Type: text/javascript; charset=" . get_bloginfo('charset'));
+    header("Vary: Accept-Encoding");  // Handle proxies
+    header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+    // Is called directly then auto init with default settings
+    if (!$isJS) {
+        echo getFileContents("tiny_mce_gzip.js");
+        echo "tinyMCE_GZ.init({});";
+        die();
+    }
+    // Setup cache info
+    if ($diskCache) {
+        if (!$cachePath)
+            die("alert('Real path failed.');");
+        $cacheKey = getParam("plugins", "") . getParam("languages", "") . getParam("themes", "");
+        foreach ($custom as $file)
+            $cacheKey .= $file;
+        $cacheKey = md5($cacheKey);
+        if ($compress)
+            $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".gz";
+        else
+            $cacheFile = $cachePath . "/tiny_mce_" . $cacheKey . ".js";
+    }
+    // Check if it supports gzip
+    if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+        $encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
+    if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') && ini_get('output_handler') != 'ob_gzhandler') {
+        $enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
+        $supportsGzip = true;
+    }
+    // Use cached file disk cache
+    if ($diskCache && $supportsGzip && file_exists($cacheFile)) {
+        if ($compress)
+            header("Content-Encoding: " . $enc);
+        echo getFileContents($cacheFile);
+        die();
+    }
 if ($index > -1) {
     // Write main script and patch some things
+    if ($index == 0) {
+        TinyMCE_echo(wp_compact_tinymce_js(file_get_contents(realpath("tiny_mce" . $suffix . ".js")))); // WP
+        TinyMCE_echo('TinyMCE.prototype.orgLoadScript = TinyMCE.prototype.loadScript;');
+        TinyMCE_echo('TinyMCE.prototype.loadScript = function() {};var realTinyMCE = tinyMCE;');
+    if ( $index == 0 ) {
+        // Add core
+        $content .= wp_compact_tinymce_js(getFileContents("tiny_mce" . $suffix . ".js"));
+        $content .= 'TinyMCE.prototype.orgLoadScript = TinyMCE.prototype.loadScript;';
+        $content .= 'TinyMCE.prototype.loadScript = function() {};var realTinyMCE = tinyMCE;';
     } else
+        TinyMCE_echo('tinyMCE = realTinyMCE;');
+        $content .= 'tinyMCE = realTinyMCE;';
+    // Patch loading functions
+    //$content .= "tinyMCE_GZ.start();";
     // Do init based on index
     TinyMCE_echo("tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);");
+    $content .= "tinyMCE.init(tinyMCECompressed.configs[" . $index . "]);";
     // Load external plugins
+    if ($index == 0)
+        TinyMCE_echo("tinyMCECompressed.loadPlugins();");
+    // Load theme, language pack and theme language packs
+    if ($theme) {
+        TinyMCE_echo(wp_compact_tinymce_js(file_get_contents(realpath("themes/" . $theme . "/editor_template" . $suffix . ".js")))); // WP
+        TinyMCE_echo(wp_tinymce_lang("themes/" . $theme . "/langs/%s.js")); // WP
+    }
+    /* WP if ($language) WP */
+        TinyMCE_echo(wp_tinymce_lang("langs/%s.js")); // WP
+    // Load all plugins and their language packs
+    $plugins = explode(",", $plugins);
+    if ( $index == 0 )
+        $content .= "tinyMCECompressed.loadPlugins();";
+    // Add core languages
+    $lang_content = '';
+    foreach ($languages as $lang)
+        $lang_content .= getFileContents("langs/" . $lang . ".js");
+    if ( empty($lang_content) )
+        $lang_content .= getFileContents("langs/en.js");
+    $content .= $lang_content;
+    // Add themes
+    foreach ($themes as $theme) {
+        $content .= wp_compact_tinymce_js(getFileContents( "themes/" . $theme . "/editor_template" . $suffix . ".js"));
+        $lang_content = '';
+        foreach ($languages as $lang)
+            $lang_content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js");
+        if ( empty($lang_content) )
+            $lang_content .= getFileContents("themes/" . $theme . "/langs/en.js");
+        $content .= $lang_content;
+    }
+    // Add plugins
     foreach ($plugins as $plugin) {
+        $pluginFile = realpath("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
+        /* WP $languageFile = realpath("plugins/" . $plugin . "/langs/" . $lang . ".js"); WP */
+        if ($pluginFile)
+            TinyMCE_echo(file_get_contents($pluginFile));
+        /* WP if ($languageFile) WP */
+            TinyMCE_echo(wp_tinymce_lang("plugins/" . $plugin . "/langs/%s.js")); // WP
+    }
+        $content .= getFileContents("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
+        $lang_content = '';
+        foreach ($languages as $lang)
+            $lang_content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js");
+        if ( empty($lang_content) )
+            $lang_content .= getFileContents("plugins/" . $plugin . "/langs/en.js");
+        $content .= $lang_content;
+    }
+    // Add custom files
+    foreach ($custom as $file)
+        $content .= getFileContents($file);
     // Reset tinyMCE compressor engine
+    TinyMCE_echo("tinyMCE = tinyMCECompressed;");
+    // Write to cache
+    if ($diskCache) {
+        // Calculate compression ratio and debug target output path
+        if ($debug) {
+            $ratio = round(100 - strlen(gzencode($cacheData, 9, FORCE_GZIP)) / strlen($cacheData) * 100.0);
+            TinyMCE_echo("alert('TinyMCE was compressed by " . $ratio . "%.\\nOutput cache file: " . $cacheFile . "');");
+        }
+        $cacheData = gzencode($cacheData, 9, FORCE_GZIP);
+        // Write to file if possible
+        $fp = @fopen($cacheFile, "wb");
+    $content .= "tinyMCE = tinyMCECompressed;";
+    // Restore loading functions
+    //$content .= "tinyMCE_GZ.end();";
+    // Generate GZIP'd content
+    if ($supportsGzip) {
+        if ($compress) {
+            header("Content-Encoding: " . $enc);
+            $cacheData = gzencode($content, 9, FORCE_GZIP);
+        } else
+            $cacheData = $content;
+        // Write gz file
+        if ($diskCache && $cacheKey != "")
+            putFileContents($cacheFile, $cacheData);
+        // Stream to client
+        echo $cacheData;
+    } else {
+        // Stream uncompressed content
+        echo $content;
+    }
+    die;
+}
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    function getParam($name, $def = false) {
+        if (!isset($_GET[$name]))
+            return $def;
+        return preg_replace("/[^0-9a-z\-_,]+/i", "", $_GET[$name]); // Remove anything but 0-9,a-z,-_
+    }
+    function getFileContents($path) {
+        $path = realpath($path);
+        if (!$path || !@is_file($path))
+            return "";
+        if (function_exists("file_get_contents"))
+            return @file_get_contents($path);
+        $content = "";
+        $fp = @fopen($path, "r");
+        if (!$fp)
+            return "";
+        while (!feof($fp))
+            $content .= fgets($fp);
+        fclose($fp);
+        return $content;
+    }
+    function putFileContents($path, $content) {
+        if (function_exists("file_put_contents"))
+            return @file_put_contents($path, $content);
+        $fp = @fopen($path, "wb");
         if ($fp) {
             fwrite($fp, $cacheData);
+            fwrite($fp, $content);
             fclose($fp);
+        }
+        // Output
+        header("Content-Encoding: " . $enc);
+        echo $cacheData;
+    }
+    die;
+}
+    }
+    // WP specific
+    function wp_compact_tinymce_js($text) {
+        // This function was custom-made for TinyMCE 2.0, not expected to work with any other JS.
+        // Strip comments
+        $text = preg_replace("!(^|\s+)//.*$!m", '', $text);
+        $text = preg_replace("!/\*.*?\*/!s", '', $text);
+        // Strip leading tabs, carriage returns and unnecessary line breaks.
+        $text = preg_replace("!^\t+!m", '', $text);
+        $text = str_replace("\r", '', $text);
+        $text = preg_replace("!(^|{|}|;|:|\))\n!m", '\\1', $text);
+        return "$text\n";
+    }
 ?>

tags/2.2/wp-includes/js/tinymce/utils/form_utils.js

-                      r5468
+                      r5480
 /**
  * $Id: form_utils.js 43 2006-08-08 16:10:07Z spocke $
+ * $Id: form_utils.js 162 2007-01-03 16:16:52Z spocke $
+ *
  * Various form utilitiy functions.
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */

tags/2.2/wp-includes/js/tinymce/utils/mclayer.js

-                      r5468
+                      r5480
 /**
  * $Id: mclayer.js 18 2006-06-29 14:11:23Z spocke $
+ * $Id: mclayer.js 162 2007-01-03 16:16:52Z spocke $
+ *
  * Moxiecode floating layer script.
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */

tags/2.2/wp-includes/js/tinymce/utils/mctabs.js

-                      r5468
+                      r5480
 /**
  * $Id: mctabs.js 18 2006-06-29 14:11:23Z spocke $
+ * $Id: mctabs.js 162 2007-01-03 16:16:52Z spocke $
+ *
  * Moxiecode DHTML Tabs script.
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */

tags/2.2/wp-includes/js/tinymce/utils/validate.js

-                      r5468
+                      r5480
 /**
  * $Id: validate.js 65 2006-08-24 15:54:55Z spocke $
+ * $Id: validate.js 162 2007-01-03 16:16:52Z spocke $
+ *
  * Various form validation methods.
+ *
  * @author Moxiecode
  * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
  */

tags/2.2/wp-includes/js/tinymce/wp-mce-help.php

-                      r5468
+                      r5480
 <div id="content4" class="hidden">
     <h2><?php _e('About TinyMCE'); ?></h2>
     <p><?php printf(__('Version: %s'), '2.0.8') ?></p>
     <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('home').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
+    <p><?php printf(__('Version: %s'), '2.0.9') ?></p>
+    <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('url').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
     <p><?php _e('Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
     <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>

tags/2.2/wp-includes/l10n.php

-                      r5468
+                      r5480
+}
+// Return a translated string.
+function __($text, $domain = 'default') {
+function translate($text, $domain) {
     global $l10n;
 …
+}
+// Return a translated string.
+function __($text, $domain = 'default') {
+    return translate($text, $domain);
+}
 // Echo a translated string.
 function _e($text, $domain = 'default') {
+    global $l10n;
+    echo translate($text, $domain);
+}
+    if (isset($l10n[$domain]))
+        echo apply_filters('gettext', $l10n[$domain]->translate($text), $text);
+    else
+        echo $text;
+function _c($text, $domain = 'default') {
+    $whole = translate($text, $domain);
+    $last_bar = strrpos($whole, '|');
+    if ( false == $last_bar ) {
+        return $whole;
+    } else {
+        return substr($whole, 0, $last_bar);
+    }
+}
 …
     if (isset($l10n[$domain])) {
         return $l10n[$domain]->ngettext($single, $plural, $number);
+        return apply_filters('ngettext', $l10n[$domain]->ngettext($single, $plural, $number), $single, $plural, $number);
     } else {
         if ($number != 1)

tags/2.2/wp-includes/link-template.php

-                      r5468
+                      r5480
 function permalink_link() { // For backwards compatibility
     echo apply_filters('the_permalink', get_permalink());
+}
+/**
+ * Conditionally adds a trailing slash if the permalink structure
+ * has a trailing slash, strips the trailing slash if not
+ * @global object Uses $wp_rewrite
+ * @param $string string a URL with or without a trailing slash
+ * @param $type_of_url string the type of URL being considered (e.g. single, category, etc) for use in the filter
+ * @return string
+ */
+function user_trailingslashit($string, $type_of_url = '') {
+    global $wp_rewrite;
+    if ( $wp_rewrite->use_trailing_slashes )
+        $string = trailingslashit($string);
+    else
+        $string = untrailingslashit($string);
+    // Note that $type_of_url can be one of following:
+    // single, single_trackback, single_feed, single_paged, feed, category, page, year, month, day, paged
+    $string = apply_filters('user_trailingslashit', $string, $type_of_url);
+    return $string;
+}
 …
         $category = '';
         if ( strstr($permalink, '%category%') ) {
+        if (strpos($permalink, '%category%') !== false) {
             $cats = get_the_category($post->ID);
             $category = $cats[0]->category_nicename;
 …
             $post->post_name,
         );
+        return apply_filters('post_link', get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
+        $permalink = get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink);
+        $permalink = user_trailingslashit($permalink, 'single');
+        return apply_filters('post_link', $permalink, $post);
     } else { // if they're not using the fancy permalink option
         $permalink = get_option('home') . '/?p=' . $post->ID;
 …
         $link = get_page_uri($id);
         $link = str_replace('%pagename%', $link, $pagestruct);
+        $link = get_option('home') . "/$link/";
+        $link = get_option('home') . "/$link";
+        $link = user_trailingslashit($link, 'page');
     } else {
         $link = get_option('home') . "/?page_id=$id";
 …
         else
             $parentlink = get_permalink( $object->post_parent );
         if (! strstr($parentlink, '?') )
+        if (strpos($parentlink, '?') === false)
             $link = trim($parentlink, '/') . '/' . $object->post_name . '/';
+    }
     if (! $link ) {
         $link = get_bloginfo('home') . "/?attachment_id=$id";
+        $link = get_bloginfo('url') . "/?attachment_id=$id";
+    }
 …
     if ( !empty($yearlink) ) {
         $yearlink = str_replace('%year%', $year, $yearlink);
         return apply_filters('year_link', get_option('home') . trailingslashit($yearlink), $year);
+        return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink, 'year'), $year);
     } else {
         return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
 …
         $monthlink = str_replace('%year%', $year, $monthlink);
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
         return apply_filters('month_link', get_option('home') . trailingslashit($monthlink), $year, $month);
+        return apply_filters('month_link', get_option('home') . user_trailingslashit($monthlink, 'month'), $year, $month);
     } else {
         return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
 …
         $daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
         $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
         return apply_filters('day_link', get_option('home') . trailingslashit($daylink), $year, $month, $day);
+        return apply_filters('day_link', get_option('home') . user_trailingslashit($daylink, 'day'), $year, $month, $day);
     } else {
         return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
 …
         $permalink = str_replace('%feed%', $feed, $permalink);
         $permalink = preg_replace('#/+#', '/', "/$permalink/");
         $output =  get_option('home') . $permalink;
+        $permalink = preg_replace('#/+#', '/', "/$permalink");
+        $output =  get_option('home') . user_trailingslashit($permalink, 'feed');
     } else {
         if ( false !== strpos($feed, 'comments_') )
 …
     return apply_filters('feed_link', $output, $feed);
+}
+function get_post_comments_feed_link($post_id = '', $feed = 'rss2') {
+    global $id;
+    if ( empty($post_id) )
+        $post_id = (int) $id;
+    if ( '' != get_option('permalink_structure') ) {
+        $url = trailingslashit( get_permalink() ) . 'feed';
+        if ( 'rss2' != $feed )
+            $url .= "/$feed";
+        $url = user_trailingslashit($url, 'single_feed');
+    } else {
+        $url = get_option('home') . "/?feed=$feed&amp;p=$id";
+    }
+    return apply_filters('post_comments_feed_link', $url);
+}
 …
     // if we already have a QUERY style page string
     if ( stristr( $qstr, $page_querystring ) ) {
+    if ( stripos( $qstr, $page_querystring ) !== false ) {
         $replacement = "$page_querystring=$pagenum";
         $qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
 …
         // we need to know the way queries are being written
         // if there's a querystring_start (a "?" usually), it's definitely not mod_rewritten
         if ( stristr( $qstr, '?' ) ) {
+        if ( stripos( $qstr, '?' ) !== false ) {
             // so append the query string (using &, since we already have ?)
             $qstr .=    '&amp;' . $page_querystring . '=' . $pagenum;
 …
     $qstr = preg_replace('|^/+|', '', $qstr);
     if ( $permalink )
         $qstr = trailingslashit($qstr);
+        $qstr = user_trailingslashit($qstr, 'paged');
     $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_option('home') ) . $qstr );
     // showing /page/1/ or ?paged=1 is redundant
     if ( 1 === $pagenum ) {
+        $qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style
+        $qstr = str_replace(user_trailingslashit('index.php/page/1', 'paged'), '', $qstr); // for PATHINFO style
+        $qstr = str_replace(user_trailingslashit('page/1', 'paged'), '', $qstr); // for mod_rewrite style
         $qstr = remove_query_arg('paged', $qstr); // for query style
+    }

tags/2.2/wp-includes/locale.php

r5468	r5480
13	13	var $meridiem;
14	14
15		var $text_direction = '';
	15	var $text_direction = 'ltr';
16	16	var $locale_vars = array('text_direction');
17	17

tags/2.2/wp-includes/pluggable.php

-                      r5468
+                      r5480
     wp_cache_add($user_id, $user, 'users');
+    wp_cache_add($user->user_login, $user, 'userlogins');
+    wp_cache_add($user->user_login, $user_id, 'userlogins');
     return $user;
+}
 …
         return false;
+    $userdata = wp_cache_get($user_login, 'userlogins');
+    $user_id = wp_cache_get($user_login, 'userlogins');
+    $userdata = wp_cache_get($user_id, 'users');
     if ( $userdata )
         return $userdata;
+    $user_login = $wpdb->escape($user_login);
     if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") )
 …
     wp_cache_add($user->ID, $user, 'users');
+    wp_cache_add($user->user_login, $user, 'userlogins');
+    wp_cache_add($user->user_login, $user->ID, 'userlogins');
     return $user;
 …
 if ( !function_exists('wp_mail') ) :
 function wp_mail($to, $subject, $message, $headers = '') {
+    if( $headers == '' ) {
+    global $phpmailer;
+    if ( !is_object( $phpmailer ) ) {
+        require_once(ABSPATH . WPINC . '/class-phpmailer.php');
+        require_once(ABSPATH . WPINC . '/class-smtp.php');
+        $phpmailer = new PHPMailer();
+    }
+    $mail = compact('to', 'subject', 'message', 'headers');
+    $mail = apply_filters('wp_mail', $mail);
+    extract($mail);
+    if ( $headers == '' ) {
         $headers = "MIME-Version: 1.0\n" .
             "From: wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME'])) . "\n" .
+            "From: " . apply_filters('wp_mail_from', "wordpress@" . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']))) . "\n" .
             "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+    }
+    return @mail($to, $subject, $message, $headers);
+    $phpmailer->ClearAddresses();
+    $phpmailer->ClearCCs();
+    $phpmailer->ClearBCCs();
+    $phpmailer->ClearReplyTos();
+    $phpmailer->ClearAllRecipients();
+    $phpmailer->ClearCustomHeaders();
+    $phpmailer->FromName = "WordPress";
+    $phpmailer->AddAddress("$to", "");
+    $phpmailer->Subject = $subject;
+    $phpmailer->Body    = $message;
+    $phpmailer->IsHTML(false);
+    $phpmailer->IsMail(); // set mailer to use php mail()
+    do_action_ref_array('phpmailer_init', array(&$phpmailer));
+    $mailheaders = (array) explode( "\n", $headers );
+    foreach ( $mailheaders as $line ) {
+        $header = explode( ":", $line );
+        switch ( trim( $header[0] ) ) {
+            case "From":
+                $from = trim( str_replace( '"', '', $header[1] ) );
+                if ( strpos( $from, '<' ) ) {
+                    $phpmailer->FromName = str_replace( '"', '', substr( $header[1], 0, strpos( $header[1], '<' ) - 1 ) );
+                    $from = trim( substr( $from, strpos( $from, '<' ) + 1 ) );
+                    $from = str_replace( '>', '', $from );
+                } else {
+                    $phpmailer->FromName = $from;
+                }
+                $phpmailer->From = trim( $from );
+                break;
+            default:
+                if ( $line != '' && $header[0] != 'MIME-Version' && $header[0] != 'Content-Type' )
+                    $phpmailer->AddCustomHeader( $line );
+                break;
+        }
+    }
+    $result = @$phpmailer->Send();
+    return $result;
+}
 endif;
 …
     $referer = strtolower(wp_get_referer());
     if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
         !(-1 == $action && strstr($referer, $adminurl)) ) {
+        !(-1 == $action && strpos($referer, $adminurl) !== false)) {
         wp_nonce_ays($action);
         die();
 …
+    }
     $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
     $notify_message .= sprintf( __('To delete this comment, visit: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n";
     $notify_message .= sprintf( __('To mark this comment as spam, visit: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n";
+    $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n";
     $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));

tags/2.2/wp-includes/plugin.php

-                      r5468
+                      r5480
 <?php
+//
+// Filter functions, the core of the WP plugin architecture.
+//
+/**
+ * Hooks a function to a specific filter action.
+ *
+ * Filters are the hooks that WordPress launches to modify text of various types
+ * before adding it to the database or sending it to the browser screen. Plugins
+ * can specify that one or more of its PHP functions is executed to
+ * modify specific types of text at these times, using the Filter API.
+ * See the [Plugin API] for a list of filter hooks.
+ *
+ * @param string $tag The name of the filter to hook the <tt>$function_to_add</tt> to.
+ * @param callback $function_to_add The name of the function to be called when the filter is applied.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1). In WordPress 1.5.1+, hooked functions can take extra arguments that are set when the matching do_action() or apply_filters() call is run.
+ * @return boolean true if the <tt>$function_to_add</tt> is added succesfully to filter <tt>$tag</tt>. How many arguments your function takes. In WordPress 1.5.1+, hooked functions can take extra arguments that are set when the matching <tt>do_action()</tt> or <tt>apply_filters()</tt> call is run. For example, the action <tt>comment_id_not_found</tt> will pass any functions that hook onto it the ID of the requested comment.
+ */
 function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
+    global $wp_filter;
+    // check that we don't already have the same filter at the same priority
+    if ( isset($wp_filter[$tag]["$priority"]) ) {
+        foreach ( $wp_filter[$tag]["$priority"] as $filter ) {
+            // uncomment if we want to match function AND accepted_args
+            // if ( $filter == array($function, $accepted_args) ) {
+            if ( $filter['function'] == $function_to_add )
+                return true;
+        }
+    }
+    // So the format is wp_filter['tag']['array of priorities']['array of ['array (functions, accepted_args)]']
+    $wp_filter[$tag]["$priority"][] = array('function'=>$function_to_add, 'accepted_args'=>$accepted_args);
+    global $wp_filter, $merged_filters;
+    // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
+    $wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+    unset( $merged_filters[ $tag ] );
     return true;
+}
+/**
+ * Call the functions added to a filter hook.
+ *
+ * The callback functions attached to filter hook <tt>$tag</tt> are invoked by
+ * calling this function. This function can be used to create a new filter hook
+ * by simply calling this function with the name of the new hook specified using
+ * the <tt>$tag</a> parameter.
+ * @uses merge_filters Merges the filter hooks using this function.
+ * @param string $tag The name of the filter hook.
+ * @param string $string The text on which the filters hooked to <tt>$tag</tt> are applied on.
+ * @param mixed $var,... Additional variables passed to the functions hooked to <tt>$tag</tt>.
+ * @return string The text in <tt>$string</tt> after all hooked functions are applied to it.
+ */
 function apply_filters($tag, $string) {
+    global $wp_filter;
+    $args = array();
+    for ( $a = 2; $a < func_num_args(); $a++ )
+        $args[] = func_get_arg($a);
+    merge_filters($tag);
+    global $wp_filter, $merged_filters;
+    if ( !isset( $merged_filters[ $tag ] ) )
+        merge_filters($tag);
     if ( !isset($wp_filter[$tag]) )
         return $string;
+    foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
+        if ( !is_null($functions) ) {
+            foreach ( (array) $functions as $function ) {
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+                $the_args = $args;
+                array_unshift($the_args, $string);
+                if ( $accepted_args > 0 )
+                    $the_args = array_slice($the_args, 0, $accepted_args);
+                elseif ( 0 == $accepted_args )
+                    $the_args = NULL;
+                $string = call_user_func_array($function_name, $the_args);
+    reset( $wp_filter[ $tag ] );
+    $args = func_get_args();
+    do{
+        foreach( (array) current($wp_filter[$tag]) as $the_ )
+            if ( !is_null($the_['function']) ){
+                $args[1] = $string;
+                $string = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
+            }
+        }
+    } while ( next($wp_filter[$tag]) );
+    return $string;
+}
+/**
+ * Merge the filter functions of a specific filter hook with generic filter functions.
+ *
+ * It is possible to defined generic filter functions using the filter hook
+ * <em>all</e>. These functions are called for every filter tag. This function
+ * merges the functions attached to the <em>all</em> hook with the functions
+ * of a specific hoook defined by <tt>$tag</tt>.
+ * @param string $tag The filter hook of which the functions should be merged.
+ */
+function merge_filters($tag) {
+    global $wp_filter, $merged_filters;
+    if ( isset($wp_filter['all']) && is_array($wp_filter['all']) )
+        $wp_filter[$tag] = array_merge($wp_filter['all'], (array) $wp_filter[$tag]);
+    if ( isset($wp_filter[$tag]) ){
+        reset($wp_filter[$tag]);
+        uksort($wp_filter[$tag], "strnatcasecmp");
+    }
+    return $string;
+}
+function merge_filters($tag) {
+    global $wp_filter;
+    if ( isset($wp_filter['all']) ) {
+        foreach ( (array) $wp_filter['all'] as $priority => $functions ) {
+            if ( isset($wp_filter[$tag][$priority]) )
+                $wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], $wp_filter[$tag][$priority]);
+            else
+                $wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], array());
+            $wp_filter[$tag][$priority] = array_unique($wp_filter[$tag][$priority]);
+        }
+    }
+    if ( isset($wp_filter[$tag]) )
+        uksort( $wp_filter[$tag], "strnatcasecmp" );
+}
+    $merged_filters[ $tag ] = true;
+}
+/**
+ * Removes a function from a specified filter hook.
+ *
+ * This function removes a function attached to a specified filter hook. This
+ * method can be used to remove default functions attached to a specific filter
+ * hook and possibly replace them with a substitute.
+ * @param string $tag The filter hook to which the function to be removed is hooked.
+ * @param callback $function_to_remove The name of the function which should be removed.
+ * @param int $priority optional. The priority of the function (default: 10).
+ * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
+ * @return boolean Whether the function is removed.
+ */
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
+    global $wp_filter;
+    // rebuild the list of filters
+    if ( isset($wp_filter[$tag]["$priority"]) ) {
+        $new_function_list = array();
+        foreach ( (array) $wp_filter[$tag]["$priority"] as $filter ) {
+            if ( $filter['function'] != $function_to_remove )
+                $new_function_list[] = $filter;
+        }
+        $wp_filter[$tag]["$priority"] = $new_function_list;
+    }
+    global $wp_filter, $merged_filters;
+    unset($GLOBALS['wp_filter'][$tag][$priority][serialize($function_to_remove)]);
+    unset( $merged_filters[ $tag ] );
     return true;
+}
+//
+// Action functions
+//
+/**
+ * Hooks a function on to a specific action.
+ *
+ * Actions are the hooks that the WordPress core launches at specific points
+ * during execution, or when specific events occur. Plugins can specify that
+ * one or more of its PHP functions are executed at these points, using the
+ * Action API.
+ *
+ * @param string $tag The name of the action to which the <tt>$function_to-add</tt> is hooked.
+ * @param callback $function_to_add The name of the function you wish to be called. Note: any of the syntaxes explained in the PHP documentation for the 'callback' type (http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback) are valid.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1). In WordPress 1.5.1+, hooked functions can take extra arguments that are set when the matching do_action() or apply_filters() call is run.
+ * @return boolean Always true.
+ */
 function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
     add_filter($tag, $function_to_add, $priority, $accepted_args);
+}
+/**
+ * Execute functions hooked on a specific action hook.
+ *
+ * This function invokes all functions attached to action hook <tt>$tag</tt>.
+ * It is possible to create new action hooks by simply calling this function,
+ * specifying the name of the new hook using the <tt>$tag</tt> parameter.
+ * @uses merge_filters
+ * @param string $tag The name of the action to be executed.
+ * @param mixed $arg,... Optional additional arguments which are passed on to the functions hooked to the action.
+ */
 function do_action($tag, $arg = '') {
     global $wp_filter, $wp_actions;
+    if ( is_array($wp_actions) )
+        $wp_actions[] = $tag;
+    else
+        $wp_actions = array($tag);
     $args = array();
 …
         return;
+    foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
+        if ( !is_null($functions) ) {
+            foreach ( (array) $functions as $function ) {
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+                if ( $accepted_args > 0 )
+                    $the_args = array_slice($args, 0, $accepted_args);
+                elseif ( $accepted_args == 0 )
+                    $the_args = NULL;
+                else
+                    $the_args = $args;
+                call_user_func_array($function_name, $the_args);
+            }
+        }
+    }
+    if ( is_array($wp_actions) )
+        $wp_actions[] = $tag;
+    else
+        $wp_actions = array($tag);
+}
+// Returns the number of times an action has been done
+    do{
+        foreach( (array) current($wp_filter[$tag]) as $the_ )
+            if ( !is_null($the_['function']) )
+                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+    } while ( next($wp_filter[$tag]) );
+}
+/**
+ * Return the number times an action is fired.
+ * @param string $tag The name of the action hook.
+ * @return int The number of times action hook <tt>$tag</tt> is fired
+ */
 function did_action($tag) {
     global $wp_actions;
+    if ( empty($wp_actions) )
+        return 0;
     return count(array_keys($wp_actions, $tag));
+}
+/**
+ * Execute functions hooked on a specific action hook, specifying arguments in a array.
+ *
+ * This function is identical to {@link do_action}, but the argumetns passe to
+ * the functions hooked to <tt>$tag</tt> are supplied using an array.
+ * @param string $tag The name of the action to be executed.
+ * @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt>
+ */
 function do_action_ref_array($tag, $args) {
     global $wp_filter, $wp_actions;
 …
         return;
+    foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
+        if ( !is_null($functions) ) {
+            foreach ( (array) $functions as $function ) {
+                $function_name = $function['function'];
+                $accepted_args = $function['accepted_args'];
+                if ( $accepted_args > 0 )
+                    $the_args = array_slice($args, 0, $accepted_args);
+                elseif ( 0 == $accepted_args )
+                    $the_args = NULL;
+                else
+                    $the_args = $args;
+                call_user_func_array($function_name, $the_args);
+            }
+        }
+    }
+}
+    do{
+        foreach( (array) current($wp_filter[$tag]) as $the_ )
+            if ( !is_null($the_['function']) )
+                call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+    } while ( next($wp_filter[$tag]) );
+}
+/**
+ * Removes a function from a specified action hook.
+ *
+ * This function removes a function attached to a specified action hook. This
+ * method can be used to remove default functions attached to a specific filter
+ * hook and possibly replace them with a substitute.
+ * @param string $tag The action hook to which the function to be removed is hooked.
+ * @param callback $function_to_remove The name of the function which should be removed.
+ * @param int $priority optional The priority of the function (default: 10).
+ * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
+ * @return boolean Whether the function is removed.
+ */
 function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
     remove_filter($tag, $function_to_remove, $priority, $accepted_args);
 …
 //
+/**
+ * Gets the basename of a plugin.
+ *
+ * This method extract the name of a plugin from its filename.
+ * @param string $file The filename of plugin.
+ * @return string The name of a plugin.
+ */
 function plugin_basename($file) {
     $file = preg_replace('|\\\\+|', '\\\\', $file);
 …
+}
+/**
+ * Hook a function on a plugin activation action hook.
+ *
+ * When a plugin is activated, the action 'activate_PLUGINNAME' hook is
+ * activated. In the name of this hook, PLUGINNAME is replaced with the name of
+ * the plugin, including the optional subdirectory. For example, when the plugin
+ * is located in <tt>wp-content/plugin/sampleplugin/sample.php</tt>, then the
+ * name of this hook will become 'activate_sampleplugin/sample.php'.
+ * When the plugin consists of only one file and is (as by default) located at
+ * <tt>wp-content/plugin/sample.php</tt> the name of this hook will be
+ * 'activate_sample.php'.
+ * @param string $file The filename of the plugin including the path.
+ * @param string $function the function hooked to the 'activate_PLUGIN' action.
+ */
 function register_activation_hook($file, $function) {
     $file = plugin_basename($file);
 …
+}
+/**
+ * Hook a function on a plugin deactivation action hook.
+ *
+ * When a plugin is deactivated, the action 'deactivate_PLUGINNAME' hook is
+ * deactivated. In the name of this hook, PLUGINNAME is replaced with the name of
+ * the plugin, including the optional subdirectory. For example, when the plugin
+ * is located in <tt>wp-content/plugin/sampleplugin/sample.php</tt>, then the
+ * name of this hook will become 'activate_sampleplugin/sample.php'.
+ * When the plugin consists of only one file and is (as by default) located at
+ * <tt>wp-content/plugin/sample.php</tt> the name of this hook will be
+ * 'activate_sample.php'.
+ * @param string $file The filename of the plugin including the path.
+ * @param string $function the function hooked to the 'activate_PLUGIN' action.
+ */
 function register_deactivation_hook($file, $function) {
     $file = plugin_basename($file);

tags/2.2/wp-includes/post-template.php

-                      r5468
+                      r5480
     $content = $pages[$page-1];
     if ( preg_match('/<!--more(.+?)?-->/', $content, $matches) ) {
+    if ( preg_match('/<!--more(.*?)?-->/', $content, $matches) ) {
         $content = explode($matches[0], $content, 2);
         if ( !empty($matches[1]) && !empty($more_link_text) )
 …
     if ( count($content) > 1 ) {
         if ( $more ) {
             $output .= '<a id="more-'.$id.'"></a>'.$content[1];
+            $output .= '<span id="more-'.$id.'"></span>'.$content[1];
         } else {
             $output = balanceTags($output);
 …
                 $output .= ' <a href="'. get_permalink() . "#more-$id\" class=\"more-link\">$more_link_text</a>";
+        }
+    }
     if ( $preview ) // preview fix for javascript bug with foreign languages
 …
 function wp_link_pages($args = '') {
+    global $post;
     if ( is_array($args) )
         $r = &$args;
 …
                 $output .= ' ';
                 if ( ($i != $page) || ((!$more) && ($page==1)) ) {
+                    if ( '' == get_option('permalink_structure') )
+                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
+                    else
+                        $output .= '<a href="' . trailingslashit(get_permalink()) . $i . '/">';
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">';
+                    } else {
+                        if ( '' == get_option('permalink_structure') || 'draft' == $post->post_status )
+                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
+                        else
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
+                    }
+                }
                 $output .= $j;
 …
                 $i = $page - 1;
                 if ( $i && $more ) {
+                    if ( '' == get_option('permalink_structure') )
+                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $previouspagelink . '</a>';
+                    else
+                        $output .= '<a href="' . get_permalink() . $i . '/">'.$previouspagelink.'</a>';
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">' . $previouspagelink . '</a>';
+                    } else {
+                        if ( '' == get_option('permalink_structure') || 'draft' == $post->post_status )
+                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $previouspagelink . '</a>';
+                        else
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $previouspagelink . '</a>';
+                    }
+                }
                 $i = $page + 1;
                 if ( $i <= $numpages && $more ) {
+                    if ( '' == get_option('permalink_structure') )
+                        $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">'.$nextpagelink.'</a>';
+                    else
+                        $output .= '<a href="' . trailingslashit(get_permalink()) . $i . '/">' . $nextpagelink . '</a>';
+                    if ( 1 == $i ) {
+                        $output .= '<a href="' . get_permalink() . '">' . $nextpagelink . '</a>';
+                    } else {
+                        if ( '' == get_option('permalink_structure') || 'draft' == $post->post_status )
+                            $output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $nextpagelink . '</a>';
+                        else
+                            $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $nextpagelink . '</a>';
+                    }
+                }
                 $output .= $after;
 …
             $values = array_map('trim', get_post_custom_values($key));
             $value = implode($values,', ');
             echo "<li><span class='post-meta-key'>$key:</span> $value</li>\n";
+            echo apply_filters('the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value);
+        }
         echo "</ul>\n";
 …
     $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_option('date_format'),
         'child_of' => 0, 'exclude' => '', 'title_li' => __('Pages'), 'echo' => 1, 'authors' => '');
+        'child_of' => 0, 'exclude' => '', 'title_li' => __('Pages'), 'echo' => 1, 'authors' => '', 'sort_column' => 'menu_order, post_title');
     $r = array_merge($defaults, $r);
 …
     $_post = & get_post($id);
     if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url() )
+    if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
         return __('Missing Attachment');

tags/2.2/wp-includes/post.php

-                      r5468
+                      r5480
 function get_extended($post) {
     //Match the new style more links
     if ( preg_match('/<!--more(.*?)-->/', $post, $matches) ) {
+    if ( preg_match('/<!--more(.*?)?-->/', $post, $matches) ) {
         list($main, $extended) = explode($matches[0], $post, 2);
     } else {
 …
         $extended = '';
+    }
     // Strip leading and trailing whitespace
     $main = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $main);
 …
     } else {
         $post = (int) $post;
+        if ( $_post = wp_cache_get($post, 'pages') )
+        if ( isset($post_cache[$blog_id][$post]) )
+            $_post = & $post_cache[$blog_id][$post];
+        elseif ( $_post = wp_cache_get($post, 'pages') )
             return get_page($_post, $output);
-        elseif ( isset($post_cache[$blog_id][$post]) )
-            $_post = & $post_cache[$blog_id][$post];
         else {
             $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1";
 …
         $exclusions .= ')';
-    $query ="SELECT DISTINCT * FROM $wpdb->posts " ;
-    $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " );
-    $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " );
-    $query .= " WHERE (post_type = 'post' AND post_status = 'publish') $exclusions $inclusions ";
-    $query .= ( empty( $category ) ? "" : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") " );
-    $query .= ( empty( $meta_key ) | empty($meta_value)  ? "" : " AND ($wpdb->posts.ID = $wpdb->postmeta.post_id AND $wpdb->postmeta.meta_key = '$meta_key' AND $wpdb->postmeta.meta_value = '$meta_value' )" );
-    $query .= " GROUP BY $wpdb->posts.ID ORDER BY " . $orderby . " " . $order . " LIMIT " . $offset . ',' . $numberposts;
     $query  = "SELECT DISTINCT * FROM $wpdb->posts ";
     $query .= empty( $category ) ? '' : ", $wpdb->post2cat ";
 …
+    }
+    do_action('deleted_post', $postid);
     return $post;
+}
 …
             $post_date_gmt = get_gmt_from_date($post_date);
+    }
     if ( 'publish' == $post_status ) {
         $now = gmdate('Y-m-d H:i:59');
 …
         if ( defined('XMLRPC_REQUEST') )
             do_action('xmlrpc_publish_post', $post_ID);
+        if ( defined('APP_REQUEST') )
+            do_action('app_publish_post', $post_ID);
         if ( !defined('WP_IMPORTING') ) {
 …
     if ( 'future' == $post_status )
         wp_schedule_single_event(strtotime($post_date_gmt. ' GMT'), 'publish_future_post', array($post_ID));
     do_action('save_post', $post_ID);
     do_action('wp_insert_post', $post_ID);
 …
     if ( ! $page_ids = wp_cache_get('all_page_ids', 'pages') ) {
         $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'");
         wp_cache_set('all_page_ids', $page_ids, 'pages');
+        wp_cache_add('all_page_ids', $page_ids, 'pages');
+    }
 …
                 // Potential issue: we're not checking to see if the post_type = 'page'
                 // So all non-'post' posts will get cached as pages.
                 wp_cache_set($_page->ID, $_page, 'pages');
+                wp_cache_add($_page->ID, $_page, 'pages');
+            }
+        }
 …
     if (!empty($authors)) {
         $post_authors = preg_split('/[\s,]+/',$authors);
         if ( count($post_authors) ) {
             foreach ( $post_authors as $post_author ) {
 …
 function is_local_attachment($url) {
     if ( !strstr($url, get_bloginfo('home') ) )
         return false;
     if ( strstr($url, get_bloginfo('home') . '/?attachment_id=') )
+    if (strpos($url, get_bloginfo('url')) === false)
+        return false;
+    if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false)
         return true;
     if ( $id = url_to_postid($url) ) {
 …
+}
+/**
+ * This function provides a standardized way to appropriately select on
+ * the post_status of posts/pages. The function will return a piece of
+ * SQL code that can be added to a WHERE clause; this SQL is constructed
+ * to allow all published posts, and all private posts to which the user
+ * has access.
+ *
+ * @param string $post_type currently only supports 'post' or 'page'.
+ * @return string SQL code that can be added to a where clause.
+ */
+function get_private_posts_cap_sql($post_type) {
+    global $user_ID;
+    $cap = '';
+    // Private posts
+    if ($post_type == 'post') {
+        $cap = 'read_private_posts';
+    // Private pages
+    } elseif ($post_type == 'page') {
+        $cap = 'read_private_pages';
+    // Dunno what it is, maybe plugins have their own post type?
+    } else {
+        $cap = apply_filters('pub_priv_sql_capability', $cap);
+        if (empty($cap)) {
+            // We don't know what it is, filters don't change anything,
+            // so set the SQL up to return nothing.
+            return '1 = 0';
+        }
+    }
+    $sql = '(post_status = \'publish\'';
+    if (current_user_can($cap)) {
+        // Does the user have the capability to view private posts? Guess so.
+        $sql .= ' OR post_status = \'private\'';
+    } elseif (is_user_logged_in()) {
+        // Users can view their own private posts.
+        $sql .= ' OR post_status = \'private\' AND post_author = \'' . $user_ID . '\'';
+    }
+    $sql .= ')';
+    return $sql;
+}
 ?>

tags/2.2/wp-includes/query.php

-                      r5468
+                      r5480
     return $wp_query->get($var);
+}
+function set_query_var($var, $value) {
+    global $wp_query;
+    return $wp_query->set($var, $value);
+}
 …
     global $wp_query;
     return ( $wp_query->is_admin || strstr($_SERVER['REQUEST_URI'], 'wp-admin/') );
+    return ($wp_query->is_admin || (strpos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
+}
 …
     global $wp_query;
     return $wp_query->is_singular;
+    return $wp_query->is_singular;
+}
 …
     $wp_query->the_post();
+}
+/*
+ * Comments loop.
+ */
+function have_comments() {
+    global $wp_query;
+    return $wp_query->have_comments();
+}
+function the_comment() {
+    global $wp_query;
+    return $wp_query->the_comment();
+}
 /*
 …
     var $in_the_loop = false;
     var $post;
+    var $comments;
+    var $comment_count = 0;
+    var $current_comment = -1;
+    var $comment;
     var $found_posts = 0;
 …
     var $is_search = false;
     var $is_feed = false;
+    var $is_comment_feed = false;
     var $is_trackback = false;
     var $is_home = false;
 …
         $this->is_search = false;
         $this->is_feed = false;
+        $this->is_comment_feed = false;
         $this->is_trackback = false;
         $this->is_home = false;
 …
         $this->parse_query('');
+    }
     function fill_query_vars($array) {
         $keys = array(
 …
                 $array[$key] = '';
+        }
         return $array;
+    }
 …
             $this->init();
             if ( is_array($query) )
                 $qv = & $query;
+                $this->query_vars = $query;
             else
                 parse_str($query, $qv);
+                parse_str($query, $this->query_vars);
             $this->query = $query;
             $this->query_vars = $qv;
+        }
         $qv = $this->fill_query_vars($qv);
+        }
+        $this->query_vars = $this->fill_query_vars($this->query_vars);
+        $qv = &$this->query_vars;
         if ( ! empty($qv['robots']) ) {
             $this->is_robots = true;
 …
+        }
+        $qv['p'] =  (int) $qv['p'];
+        $qv['page_id'] =  (int) $qv['page_id'];
+        $qv['year'] = (int) $qv['year'];
+        $qv['monthnum'] = (int) $qv['monthnum'];
+        $qv['day'] = (int) $qv['day'];
+        $qv['w'] = (int) $qv['w'];
         $qv['m'] =  (int) $qv['m'];
+        $qv['p'] =  (int) $qv['p'];
+        if ( '' != $qv['hour'] ) $qv['hour'] = (int) $qv['hour'];
+        if ( '' != $qv['minute'] ) $qv['minute'] = (int) $qv['minute'];
+        if ( '' != $qv['second'] ) $qv['second'] = (int) $qv['second'];
         // Compat.  Map subpost to attachment.
 …
             $qv['attachment_id'] = $qv['subpost_id'];
+        if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) {
+        $qv['attachment_id'] = (int) $qv['attachment_id'];
+        if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
             $this->is_single = true;
             $this->is_attachment = true;
         } elseif ('' != $qv['name']) {
+        } elseif ( '' != $qv['name'] ) {
             $this->is_single = true;
         } elseif ( $qv['p'] ) {
             $this->is_single = true;
         } elseif (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
+        } elseif ( ('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
             // If year, month, day, hour, minute, and second are set, a single
             // post is being queried.
             $this->is_single = true;
         } elseif ('' != $qv['static'] || '' != $qv['pagename'] || (int) $qv['page_id']) {
+        } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
             $this->is_page = true;
             $this->is_single = false;
         } elseif (!empty($qv['s'])) {
+        } elseif ( !empty($qv['s']) ) {
             $this->is_search = true;
         } else {
         // Look for archive queries.  Dates, categories, authors.
             if ( (int) $qv['second']) {
+            if ( '' != $qv['second'] ) {
                 $this->is_time = true;
                 $this->is_date = true;
+            }
             if ( (int) $qv['minute']) {
+            if ( '' != $qv['minute'] ) {
                 $this->is_time = true;
                 $this->is_date = true;
+            }
             if ( (int) $qv['hour']) {
+            if ( '' != $qv['hour'] ) {
                 $this->is_time = true;
                 $this->is_date = true;
+            }
             if ( (int) $qv['day']) {
+            if ( $qv['day'] ) {
                 if (! $this->is_date) {
                     $this->is_day = true;
 …
+            }
             if ( (int)  $qv['monthnum']) {
+            if ( $qv['monthnum'] ) {
                 if (! $this->is_date) {
                     $this->is_month = true;
 …
+            }
             if ( (int)  $qv['year']) {
+            if ( $qv['year'] ) {
                 if (! $this->is_date) {
                     $this->is_year = true;
 …
+            }
             if ( (int)  $qv['m']) {
+            if ( $qv['m'] ) {
                 $this->is_date = true;
                 if (strlen($qv['m']) > 9) {
 …
+            }
             if (empty($qv['cat']) || ($qv['cat'] == '0')) {
+            if ( empty($qv['cat']) || ($qv['cat'] == '0') ) {
                 $this->is_category = false;
             } else {
                 if (stristr($qv['cat'],'-')) {
+                if (strpos($qv['cat'], '-') !== false) {
                     $this->is_category = false;
                 } else {
 …
+            }
             if ('' != $qv['category_name']) {
+            if ( '' != $qv['category_name'] ) {
                 $this->is_category = true;
+            }
             if ((empty($qv['author'])) || ($qv['author'] == '0')) {
+            if ( empty($qv['author']) || ($qv['author'] == '0') ) {
                 $this->is_author = false;
             } else {
 …
+            }
             if ('' != $qv['author_name']) {
+            if ( '' != $qv['author_name'] ) {
                 $this->is_author = true;
+            }
             if ( ($this->is_date || $this->is_author || $this->is_category)) {
+            if ( ($this->is_date || $this->is_author || $this->is_category) )
                 $this->is_archive = true;
+            }
+        }
+        if ('' != $qv['feed']) {
+        }
+        if ( '' != $qv['feed'] )
             $this->is_feed = true;
+        }
+        if ('' != $qv['tb']) {
+        if ( '' != $qv['tb'] )
             $this->is_trackback = true;
+        }
+        if ('' != $qv['paged']) {
+        if ( '' != $qv['paged'] )
             $this->is_paged = true;
+        }
+        if ('' != $qv['comments_popup']) {
+        if ( '' != $qv['comments_popup'] )
             $this->is_comments_popup = true;
+        }
+        //if we're previewing inside the write screen
+        if ('' != $qv['preview']) {
+        // if we're previewing inside the write screen
+        if ('' != $qv['preview'])
             $this->is_preview = true;
+        }
+        if (strstr($_SERVER['PHP_SELF'], 'wp-admin/')) {
+        if ( strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
             $this->is_admin = true;
+        }
+        if ( $this->is_single || $this->is_page || $this->is_attachment )
+            $this->is_singular = true;
+        if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
+        if ( false !== strpos($qv['feed'], 'comments-') ) {
+            $qv['feed'] = str_replace('comments-', '', $qv['feed']);
+            $qv['withcomments'] = 1;
+        }
+        $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
+        if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+            $this->is_comment_feed = true;
+        if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup ) )
             $this->is_home = true;
+        }
+        if ( !empty($query) ) {
+        // Correct is_* for page_on_front and page_for_posts
+        if ( $this->is_home && ( empty($this->query) || $qv['preview'] == 'true' ) && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+            $this->is_page = true;
+            $this->is_home = false;
+            $qv['page_id'] = get_option('page_on_front');
+        }
+        if ( '' != $qv['pagename'] ) {
+            $this->queried_object =& get_page_by_path($qv['pagename']);
+            if ( !empty($this->queried_object) )
+                $this->queried_object_id = (int) $this->queried_object->ID;
+            else
+                unset($this->queried_object);
+            if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
+                $this->is_page = false;
+                $this->is_home = true;
+                $this->is_posts_page = true;
+            }
+        }
+        if ( $qv['page_id'] ) {
+            if  ( 'page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts') ) {
+                $this->is_page = false;
+                $this->is_home = true;
+                $this->is_posts_page = true;
+            }
+        }
+        if ( $this->is_posts_page && !$qv['withcomments'] )
+            $this->is_comment_feed = false;
+        $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
+        // Done correcting is_* for page_on_front and page_for_posts
+        if ( !empty($query) )
             do_action_ref_array('parse_query', array(&$this));
+        }
+    }
 …
         // Shorthand.
         $q = &$this->query_vars;
         $q = $this->fill_query_vars($q);
 …
         // If a month is specified in the querystring, load that month
         if ( (int) $q['m'] ) {
+        if ( $q['m'] ) {
             $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
             $where .= ' AND YEAR(post_date)=' . substr($q['m'], 0, 4);
 …
+        }
+        if ( (int) $q['hour'] ) {
+            $q['hour'] = '' . intval($q['hour']);
+        if ( '' != $q['hour'] )
             $where .= " AND HOUR(post_date)='" . $q['hour'] . "'";
+        }
+        if ( (int) $q['minute'] ) {
+            $q['minute'] = '' . intval($q['minute']);
+        if ( '' != $q['minute'] )
             $where .= " AND MINUTE(post_date)='" . $q['minute'] . "'";
+        }
+        if ( (int) $q['second'] ) {
+            $q['second'] = '' . intval($q['second']);
+        if ( '' != $q['second'] )
             $where .= " AND SECOND(post_date)='" . $q['second'] . "'";
+        }
+        if ( (int) $q['year'] ) {
+            $q['year'] = '' . intval($q['year']);
+        if ( $q['year'] )
             $where .= " AND YEAR(post_date)='" . $q['year'] . "'";
+        }
+        if ( (int) $q['monthnum'] ) {
+            $q['monthnum'] = '' . intval($q['monthnum']);
+        if ( $q['monthnum'] )
             $where .= " AND MONTH(post_date)='" . $q['monthnum'] . "'";
+        }
+        if ( (int) $q['day'] ) {
+            $q['day'] = '' . intval($q['day']);
+        if ( $q['day'] )
             $where .= " AND DAYOFMONTH(post_date)='" . $q['day'] . "'";
+        }
-        // Compat.  Map subpost to attachment.
-        if ( '' != $q['subpost'] )
-            $q['attachment'] = $q['subpost'];
-        if ( '' != $q['subpost_id'] )
-            $q['attachment_id'] = $q['subpost_id'];
         if ('' != $q['name']) {
 …
             $where .= " AND post_name = '" . $q['name'] . "'";
         } else if ('' != $q['pagename']) {
+            $reqpage = get_page_by_path($q['pagename']);
+            if ( !empty($reqpage) )
+                $reqpage = $reqpage->ID;
+            else
+                $reqpage = 0;
+            if  ( ('page' == get_option('show_on_front') ) && ( $reqpage == get_option('page_for_posts') ) ) {
+                $this->is_singular = false;
+                $this->is_page = false;
+                $this->is_home = true;
+                $this->is_posts_page = true;
+            } else {
+            if ( isset($this->queried_object_id) )
+                $reqpage = $this->queried_object_id;
+            else {
+                $reqpage = get_page_by_path($q['pagename']);
+                if ( !empty($reqpage) )
+                    $reqpage = $reqpage->ID;
+                else
+                    $reqpage = 0;
+            }
+            if  ( ('page' != get_option('show_on_front') ) || ( $reqpage != get_option('page_for_posts') ) ) {
                 $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
                 $page_paths = '/' . trim($q['pagename'], '/');
 …
+        }
+        if ( (int) $q['w'] ) {
+            $q['w'] = ''.intval($q['w']);
+        if ( $q['w'] )
             $where .= " AND WEEK(post_date, 1)='" . $q['w'] . "'";
+        }
         if ( intval($q['comments_popup']) )
             $q['p'] = intval($q['comments_popup']);
         // If a attachment is requested by number, let it supercede any post number.
         if ( ($q['attachment_id'] != '') && (intval($q['attachment_id']) != 0) )
             $q['p'] = (int) $q['attachment_id'];
+        // If an attachment is requested by number, let it supercede any post number.
+        if ( $q['attachment_id'] )
+            $q['p'] = $q['attachment_id'];
         // If a post number is specified, load that post
+        if (($q['p'] != '') && intval($q['p']) != 0) {
+            $q['p'] =  (int) $q['p'];
+        if ( $q['p'] )
             $where = ' AND ID = ' . $q['p'];
+        }
+        if (($q['page_id'] != '') && (intval($q['page_id']) != 0)) {
+            $q['page_id'] = intval($q['page_id']);
+            if  ( ('page' == get_option('show_on_front') ) && ( $q['page_id'] == get_option('page_for_posts') ) ) {
+                $this->is_singular = false;
+                $this->is_page = false;
+                $this->is_home = true;
+                $this->is_posts_page = true;
+            } else {
+        if ( $q['page_id'] ) {
+            if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
                 $q['p'] = $q['page_id'];
                 $where = ' AND ID = '.$q['page_id'];
+                $where = ' AND ID = ' . $q['page_id'];
+            }
+        }
         // If a search pattern is specified, load the posts that match
         if (!empty($q['s'])) {
+        if ( !empty($q['s']) ) {
             // added slashes screw with quote grouping when done early, so done later
             $q['s'] = stripslashes($q['s']);
 …
         // Category stuff
         if ((empty($q['cat'])) || ($q['cat'] == '0') ||
+        if ( empty($q['cat']) || ($q['cat'] == '0') ||
                 // Bypass cat checks if fetching specific posts
                 ( $this->is_single || $this->is_page )) {
             $whichcat='';
+                $this->is_singular ) {
+            $whichcat = '';
         } else {
             $q['cat'] = ''.urldecode($q['cat']).'';
 …
             foreach ( $cat_array as $cat ) {
                 $cat = intval($cat);
                 $in = strstr($cat, '-') ? false : true;
+                $in = (strpos($cat, '-') !== false) ? false : true;
                 $cat = trim($cat, '-');
                 if ( $in )
 …
         // Category stuff for nice URLs
         if ('' != $q['category_name']) {
+        if ( '' != $q['category_name'] ) {
             $reqcat = get_category_by_path($q['category_name']);
             $q['category_name'] = str_replace('%2F', '/', urlencode(urldecode($q['category_name'])));
 …
+        }
         // Author/user stuff
         if ((empty($q['author'])) || ($q['author'] == '0')) {
+        if ( empty($q['author']) || ($q['author'] == '0') ) {
             $whichauthor='';
         } else {
             $q['author'] = ''.urldecode($q['author']).'';
             $q['author'] = addslashes_gpc($q['author']);
             if (stristr($q['author'], '-')) {
+            if (strpos($q['author'], '-') !== false) {
                 $eq = '!=';
                 $andor = 'AND';
 …
         if ('' != $q['author_name']) {
             if (stristr($q['author_name'],'/')) {
+            if (strpos($q['author_name'], '/') !== false) {
                 $q['author_name'] = explode('/',$q['author_name']);
                 if ($q['author_name'][count($q['author_name'])-1]) {
 …
         $where .= $search.$whichcat.$whichauthor;
+        if ((empty($q['order'])) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC'))) {
+            $q['order']='DESC';
+        }
+        if ( empty($q['order']) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC')) )
+            $q['order'] = 'DESC';
         // Order by
         if (empty($q['orderby'])) {
+        if ( empty($q['orderby']) ) {
             $q['orderby'] = 'post_date '.$q['order'];
         } else {
 …
         // Paging
         if (empty($q['nopaging']) && !$this->is_singular) {
+        if ( empty($q['nopaging']) && !$this->is_singular ) {
             $page = abs(intval($q['paged']));
             if (empty($page)) {
 …
                 $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+            }
+        }
+        // Comments feeds
+        if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
+            if ( $this->is_archive || $this->is_search ) {
+                $cjoin = "LEFT JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";
+                $cwhere = "WHERE comment_approved = '1' $where";
+                $cgroupby = "GROUP BY $wpdb->comments.comment_id";
+            } else { // Other non singular e.g. front
+                $cjoin = "LEFT JOIN $wpdb->posts ON ( $wpdb->comments.comment_post_ID = $wpdb->posts.ID )";
+                $cwhere = "WHERE post_status = 'publish' AND comment_approved = '1'";
+                $cgroupby = '';
+            }
+            $cjoin = apply_filters('comment_feed_join', $cjoin);
+            $cwhere = apply_filters('comment_feed_where', $cwhere);
+            $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
+            $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'));
+            $this->comment_count = count($this->comments);
+            $post_ids = array();
+            foreach ($this->comments as $comment)
+                $post_ids[] = (int) $comment->comment_post_ID;
+            $post_ids = join(',', $post_ids);
+            $join = '';
+            if ( $post_ids )
+                $where = "AND $wpdb->posts.ID IN ($post_ids) ";
+            else
+                $where = "AND 0";
+        }
 …
         $this->posts = $wpdb->get_results($this->request);
+        if ( $this->is_comment_feed && $this->is_singular ) {
+            $cjoin = apply_filters('comment_feed_join', '');
+            $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = {$this->posts[0]->ID} AND comment_approved = '1'");
+            $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss');
+            $this->comments = $wpdb->get_results($comments_request);
+            $this->comment_count = count($this->comments);
+        }
         if ( !empty($limits) ) {
             $found_posts_query = apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()' );
 …
             $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
+        }
         // Check post status to determine if post should be displayed.
         if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
 …
+    }
+    function next_comment() {
+        $this->current_comment++;
+        $this->comment = $this->comments[$this->current_comment];
+        return $this->comment;
+    }
+    function the_comment() {
+        global $comment;
+        $comment = $this->next_comment();
+        if ($this->current_comment == 0) {
+            do_action('comment_loop_start');
+        }
+    }
+    function have_comments() {
+        if ($this->current_comment + 1 < $this->comment_count) {
+            return true;
+        } elseif ($this->current_comment + 1 == $this->comment_count) {
+            $this->rewind_comments();
+        }
+        return false;
+    }
+    function rewind_comments() {
+        $this->current_comment = -1;
+        if ($this->comment_count > 0) {
+            $this->comment = $this->comments[0];
+        }
+    }
     function &query($query) {
         $this->parse_query($query);
 …
             $category = &get_category($cat);
             $this->queried_object = &$category;
             $this->queried_object_id = $cat;
+            $this->queried_object_id = (int) $cat;
         } else if ($this->is_posts_page) {
             $this->queried_object = & get_page(get_option('page_for_posts'));
             $this->queried_object_id = $this->queried_object->ID;
+            $this->queried_object_id = (int) $this->queried_object->ID;
         } else if ($this->is_single) {
             $this->queried_object = $this->post;
             $this->queried_object_id = $this->post->ID;
+            $this->queried_object_id = (int) $this->post->ID;
         } else if ($this->is_page) {
             $this->queried_object = $this->post;
             $this->queried_object_id = $this->post->ID;
+            $this->queried_object_id = (int) $this->post->ID;
         } else if ($this->is_author) {
             $author_id = $this->get('author');
+            $author_id = (int) $this->get('author');
             $author = get_userdata($author_id);
             $this->queried_object = $author;
 …
     global $pagenow;
     $id = $post->ID;
+    $id = (int) $post->ID;
     $authordata = get_userdata($post->post_author);

tags/2.2/wp-includes/registration-functions.php

Property svn:eol-style set to native

tags/2.2/wp-includes/rewrite.php

-                      r5468
+                      r5480
 //pseudo-places
 define('EP_NONE',       0  );
 define('EP_ALL',        255);
+define('EP_ALL',        4095);
 //and an endpoint, like /trackback/
 …
 function url_to_postid($url) {
     global $wp_rewrite;
+    $url = apply_filters('url_to_postid', $url);
     // First, check to see if there is a 'p=N' or 'page_id=N' to match against
 …
 class WP_Rewrite {
     var $permalink_structure;
+    var $use_trailing_slashes;
     var $category_base;
     var $category_structure;
 …
                 $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
+            //do endpoints
+            if ($endpoints) {
+                foreach ($ep_query_append as $regex => $ep) {
+                    //add the endpoints on if the mask fits
+                    if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific) {
+                        $rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+                    }
+                }
+            }
             //if we've got some tags in this dir
             if ($num_toks) {
 …
                 //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
                 //minute all present). Set these flags now as we need them for the endpoints.
                 if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
                         || strstr($struct, '%pagename%')
                         || (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
+                if (strpos($struct, '%postname%') !== false || strpos($struct, '%post_id%') !== false
+                        || strpos($struct, '%pagename%') !== false
+                        || (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)) {
                     $post = true;
                     if  ( strstr($struct, '%pagename%') )
+                    if (strpos($struct, '%pagename%') !== false)
                         $page = true;
+                }
-                //do endpoints
-                if ($endpoints) {
-                    foreach ($ep_query_append as $regex => $ep) {
-                        //add the endpoints on if the mask fits
-                        if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific) {
-                            $rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+                        }
+                    }
+                }
 …
+                }
                 if (strstr($query, $this->index)) {
+                if (strpos($query, $this->index) !== false) {
                     $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
                 } else {
 …
         unset($this->feed_structure);
         unset($this->comment_feed_structure);
+        $this->use_trailing_slashes = ( substr($this->permalink_structure, -1, 1) == '/' ) ? true : false;
+    }

tags/2.2/wp-includes/rss-functions.php

Property svn:eol-style set to native

tags/2.2/wp-includes/script-loader.php

-                      r5468
+                      r5480
         $this->add( 'fat', '/wp-includes/js/fat.js', false, '1.0-RC1_3660' );
         $this->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
+        $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
+        $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3958' );
+        $this->localize( 'quicktags', 'quicktagsL10n', array(
+            'quickLinks' => __('(Quick Links)'),
+            'wordLookup' => __('Enter a word to look up:'),
+            'dictionaryLookup' => attribute_escape(__('Dictionary lookup')),
+            'lookup' => attribute_escape(__('lookup')),
+            'closeAllOpenTags' => attribute_escape(__('Close all open tags')),
+            'closeTags' => attribute_escape(__('close tags')),
+            'enterURL' => __('Enter the URL'),
+            'enterImageURL' => __('Enter the URL of the image'),
+            'enterImageDescription' => __('Enter a description of the image')
+        ) );
         $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
         $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20061113' );
+        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070326' );
         $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
         $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070225' );
+        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
+        $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116');
+        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '20070118');
+        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '20070118');
+        $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.6.1');
+        $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.6.1');
+        $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder'), '1.6.1');
+        $this->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.6.1');
+        $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.6.1');
+        $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.6.1');
+        $this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.6.1');
+        $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0-0');
+        $this->add( 'autosave', '/wp-includes/js/autosave.js', array('prototype', 'sack'), '20070306');
+        $this->localize( 'autosave', 'autosaveL10n', array(
+            'autosaveInterval' => apply_filters('autosave_interval', '120'),
+            'errorText' => __('Error: %response%'),
+            'saveText' => __('Saved at %time%.'),
+            'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+            'savingText' => __('Saving Draft...')
+        ) );
+        $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax.js', array('prototype'), '20070306');
+        $this->localize( 'wp-ajax', 'WPAjaxL10n', array(
+            'defaultUrl' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
+            'permText' => __("You don't have permission to do that."),
+            'strangeText' => __("Something strange happened.  Try refreshing the page."),
+            'whoaText' => __("Slow down, I'm still sending your data!")
+        ) );
+        $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070306' );
+        $this->localize( 'listman', 'listManL10n', array(
+            'jumpText' => __('Jump to new item'),
+            'delText' => __('Are you sure you want to delete this %thing%?')
+        ) );
+        $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.0');
+        $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.7.0');
+        $this->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.7.0');
+        $this->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.7.0');
+        $this->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.7.0');
+        $this->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.7.0');
+        $this->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.7.0');
         $this->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
+        $this->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.1.2');
+        $this->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2');
         if ( is_admin() ) {
+            $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );
+            $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '20070118' );
+            global $pagenow;
+            $man = false;
+            switch ( $pagenow ) :
+            case 'post.php' :
+            case 'post-new.php' :
+                $man = 'postmeta';
+                break;
+            case 'page.php' :
+            case 'page-new.php' :
+                $man = 'pagemeta';
+                break;
+            case 'link-add.php' :
+            case 'link.php' :
+                $man = 'linkmeta';
+                break;
+            endswitch;
+            if ( $man ) {
+                $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key.js', array('dbx'), '20070417' );
+                $this->localize( 'dbx-admin-key', 'dbxL10n', array(
+                    'manager' => $man,
+                    'open' => __('open'),
+                    'close' => __('close'),
+                    'moveMouse' => __('click-down and drag to move this box'),
+                    'toggleMouse' => __('click to %toggle% this box'),
+                    'moveKey' => __('use the arrow keys to move this box'),
+                    'toggleKey' => __(', or press the enter key to %toggle% it'),
+                ) );
+            }
+            $this->add( 'ajaxcat', '/wp-admin/cat.js', array('listman'), '20070417' );
+            $this->localize( 'ajaxcat', 'catL10n', array(
+                'add' => attribute_escape(__('Add')),
+                'how' => __('Separate multiple categories with commas.')
+            ) );
             $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' );
             $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );
             $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' );
+            $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '20070327' );
             $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' );
             $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
+            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070118' );
+            $this->add( 'upload', '/wp-admin/upload.js', array('prototype'), '20070306' );
+            $this->localize( 'upload', 'uploadL10n', array(
+                'browseTitle' => attribute_escape(__('Browse your files')),
+                'back' => __('&laquo; Back'),
+                'directTitle' => attribute_escape(__('Direct link to file')),
+                'edit' => __('Edit'),
+                'thumb' => __('Thumbnail'),
+                'full' => __('Full size'),
+                'icon' => __('Icon'),
+                'title' => __('Title'),
+                'show' => __('Show:'),
+                'link' => __('Link to:'),
+                'file' => __('File'),
+                'page' => __('Page'),
+                'none' => __('None'),
+                'editorText' => attribute_escape(__('Send to editor &raquo;')),
+                'insert' => __('Insert'),
+                'urlText' => __('URL'),
+                'desc' => __('Description'),
+                'deleteText' => attribute_escape(__('Delete File')),
+                'saveText' => attribute_escape(__('Save &raquo;')),
+                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
+            ) );
+        }
+    }
 …
                         $ver .= '&amp;' . $this->args[$handle];
                     $src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src;
+                    $src = clean_url(add_query_arg('ver', $ver, $src));
+                    $src = $this->scripts[$handle]->src;
+                    if (!preg_match('|^https?://|', $src)) {
+                        $src = get_option('siteurl') . $src;
+                    }
+                    $src = add_query_arg('ver', $ver, $src);
+                    $src = clean_url(apply_filters( 'script_loader_src', $src ));
                     echo "<script type='text/javascript' src='$src'></script>\n";
+                    $this->print_scripts_l10n( $handle );
+                }
                 $this->printed[] = $handle;
 …
+    }
+    function print_scripts_l10n( $handle ) {
+        if ( empty($this->scripts[$handle]->l10n_object) || empty($this->scripts[$handle]->l10n) || !is_array($this->scripts[$handle]->l10n) )
+            return;
+        $object_name = $this->scripts[$handle]->l10n_object;
+        echo "<script type='text/javascript'>\n";
+        echo "/* <![CDATA[ */\n";
+        echo "\t$object_name = {\n";
+        $eol = '';
+        foreach ( $this->scripts[$handle]->l10n as $var => $val ) {
+            echo "$eol\t\t$var: \"" . js_escape( $val ) . '"';
+            $eol = ",\n";
+        }
+        echo "\n\t}\n";
+        echo "/* ]]> */\n";
+        echo "</script>\n";
+    }
     /**
 …
+    }
+    /**
+     * Localizes a script
+     *
+     * Localizes only if script has already been added
+     *
+     * @param string handle Script name
+     * @param string object_name Name of JS object to hold l10n info
+     * @param array l10n Array of JS var name => localized string
+     * @return bool Successful localization
+     */
+    function localize( $handle, $object_name, $l10n ) {
+        if ( !isset($this->scripts[$handle]) )
+            return false;
+        return $this->scripts[$handle]->localize( $object_name, $l10n );
+    }
     function remove( $handles ) {
         foreach ( (array) $handles as $handle )
 …
     var $deps = array();
     var $ver = false;
+    var $args = false;
+    var $l10n_object = '';
+    var $l10n = array();
     function _WP_Script() {
 …
             $this->ver = false;
+    }
+    function localize( $object_name, $l10n ) {
+        if ( !$object_name || !is_array($l10n) )
+            return false;
+        $this->l10n_object = $object_name;
+        $this->l10n = $l10n;
+        return true;
+    }
+}
 …
+}
+/**
+ * Localizes a script
+ *
+ * Localizes only if script has already been added
+ *
+ * @see WP_Script::localize()
+ */
+function wp_localize_script( $handle, $object_name, $l10n ) {
+    global $wp_scripts;
+    if ( !is_a($wp_scripts, 'WP_Scripts') )
+        return false;
+    return $wp_scripts->localize( $handle, $object_name, $l10n );
+}
 function wp_deregister_script( $handle ) {
     global $wp_scripts;

tags/2.2/wp-includes/template-loader.php

-                      r5468
+                      r5480
     if ( is_robots() ) {
         do_action('do_robots');
         exit;
+        return;
     } else if ( is_feed() ) {
         do_feed();
         exit;
+        return;
     } else if ( is_trackback() ) {
         include(ABSPATH . '/wp-trackback.php');
         exit;
+        return;
     } else if ( is_404() && $template = get_404_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_search() && $template = get_search_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_home() && $template = get_home_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_attachment() && $template = get_attachment_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_single() && $template = get_single_template() ) {
         if ( is_attachment() )
             add_filter('the_content', 'prepend_attachment');
         include($template);
         exit;
+        return;
     } else if ( is_page() && $template = get_page_template() ) {
         if ( is_attachment() )
             add_filter('the_content', 'prepend_attachment');
         include($template);
         exit;
+        return;
     } else if ( is_category() && $template = get_category_template()) {
         include($template);
         exit;
+        return;
     } else if ( is_author() && $template = get_author_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_date() && $template = get_date_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_archive() && $template = get_archive_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
         include($template);
         exit;
+        return;
     } else if ( is_paged() && $template = get_paged_template() ) {
         include($template);
         exit;
+        return;
     } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
         if ( is_attachment() )
             add_filter('the_content', 'prepend_attachment');
         include(TEMPLATEPATH . "/index.php");
         exit;
+        return;
+    }
 } else {
 …
     if ( is_robots() ) {
         do_action('do_robots');
         exit;
+        return;
     } else if ( is_feed() ) {
         do_feed();
         exit;
+        return;
     } else if ( is_trackback() ) {
         include(ABSPATH . '/wp-trackback.php');
         exit;
+        return;
+    }
+}

tags/2.2/wp-includes/theme.php

-                      r5468
+                      r5480
     $name = trim( $name );
     $theme = $name;
+    $theme_uri = trim( $theme_uri[1] );
     if ( '' == $author_uri[1] ) {
 …
+    }
     return array( 'Name' => $name, 'Title' => $theme, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1], 'Status' => $status );
+    return array( 'Name' => $name, 'Title' => $theme, 'URI' => $theme_uri, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1], 'Status' => $status );
+}
 …
         $stylesheet  = dirname($theme_file);
+        $screenshot = false;
         foreach ( array('png', 'gif', 'jpg', 'jpeg') as $ext ) {
             if (file_exists("$theme_root/$stylesheet/screenshot.$ext")) {
 …
             $parent_dir = dirname(dirname($theme_file));
             if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) {
                 $template = "$parent_dir/$template";
+                $template = "$parent_dir/$template";
             } else {
                 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
 …
     if ( isset($mods[$name]) )
         return $mods[$name];
     return sprintf($default, get_template_directory_uri());
+        return apply_filters( "theme_mod_$name", $mods[$name] );
+    return apply_filters( "theme_mod_$name", sprintf($default, get_template_directory_uri()) );
+}
 …
 function header_textcolor() {
     echo get_header_textcolor();
+    echo get_header_textcolor();
+}
 …
 function header_image() {
     echo get_header_image();
+    echo get_header_image();
+}

tags/2.2/wp-includes/user.php

-                      r5468
+                      r5480
     global $wpdb;
     $userid = (int) $userid;
     return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$userid' AND post_type = 'post' AND post_status = 'publish'");
+    return $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$userid' AND post_type = 'post' AND " . get_private_posts_cap_sql('post'));
+}
 …
         $option_name = $wpdb->prefix . $option_name;
     return update_usermeta( $user_id, $option_name, $newvalue );
+}
+// Get users with capabilities for the current blog.
+// For setups that use the multi-blog feature.
+function get_users_of_blog( $id = '' ) {
+    global $wpdb, $blog_id;
+    if ( empty($id) )
+        $id = (int) $blog_id;
+    $users = $wpdb->get_results( "SELECT user_id, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND meta_key = '" . $wpdb->prefix . "capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+    return $users;
+}

tags/2.2/wp-includes/vars.php

-                      r5468
+                      r5480
 // Simple browser detection
+// We should probably be doing true/false instead of 1/0 here ~ Mark
+$is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0;
+$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = false;
+if ( preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT']) )
+    $is_lynx = 1;
+elseif ( preg_match('/Gecko/', $_SERVER['HTTP_USER_AGENT']) )
+    $is_gecko = 1;
+elseif ( preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT']) && preg_match('/Win/', $_SERVER['HTTP_USER_AGENT']) )
+    $is_winIE = 1;
+elseif ( preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT']) && preg_match('/Mac/', $_SERVER['HTTP_USER_AGENT']) )
+    $is_macIE = 1;
+elseif ( preg_match('/Opera/', $_SERVER['HTTP_USER_AGENT']) )
+    $is_opera = 1;
+elseif ( preg_match('/Nav/', $_SERVER['HTTP_USER_AGENT']) || preg_match('/Mozilla\/4\./', $_SERVER['HTTP_USER_AGENT']) )
+    $is_NS4 = 1;
+if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
+    $is_lynx = true;
+} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
+    $is_gecko = true;
+} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
+    $is_winIE = true;
+} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
+    $is_macIE = true;
+} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
+    $is_opera = true;
+} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
+    $is_NS4 = true;
+}
 $is_IE = ( $is_macIE || $is_winIE );
 // Server detection
+$is_apache = ( strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') || strstr($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') ) ? 1 : 0;
+$is_IIS = strstr($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') ? 1 : 0;
+// if the config file does not provide the smilies array, let's define it here
+if (!isset($wpsmiliestrans)) {
+    $wpsmiliestrans = array(
+    ':mrgreen:' => 'icon_mrgreen.gif',
+    ':neutral:' => 'icon_neutral.gif',
+    ':twisted:' => 'icon_twisted.gif',
+      ':arrow:' => 'icon_arrow.gif',
+      ':shock:' => 'icon_eek.gif',
+      ':smile:' => 'icon_smile.gif',
+        ':???:' => 'icon_confused.gif',
+       ':cool:' => 'icon_cool.gif',
+       ':evil:' => 'icon_evil.gif',
+       ':grin:' => 'icon_biggrin.gif',
+       ':idea:' => 'icon_idea.gif',
+       ':oops:' => 'icon_redface.gif',
+       ':razz:' => 'icon_razz.gif',
+       ':roll:' => 'icon_rolleyes.gif',
+       ':wink:' => 'icon_wink.gif',
+        ':cry:' => 'icon_cry.gif',
+        ':eek:' => 'icon_surprised.gif',
+        ':lol:' => 'icon_lol.gif',
+        ':mad:' => 'icon_mad.gif',
+        ':sad:' => 'icon_sad.gif',
+          '8-)' => 'icon_cool.gif',
+          '8-O' => 'icon_eek.gif',
+          ':-(' => 'icon_sad.gif',
+          ':-)' => 'icon_smile.gif',
+          ':-?' => 'icon_confused.gif',
+          ':-D' => 'icon_biggrin.gif',
+          ':-P' => 'icon_razz.gif',
+          ':-o' => 'icon_surprised.gif',
+          ':-x' => 'icon_mad.gif',
+          ':-|' => 'icon_neutral.gif',
+          ';-)' => 'icon_wink.gif',
+           '8)' => 'icon_cool.gif',
+           '8O' => 'icon_eek.gif',
+           ':(' => 'icon_sad.gif',
+           ':)' => 'icon_smile.gif',
+           ':?' => 'icon_confused.gif',
+           ':D' => 'icon_biggrin.gif',
+           ':P' => 'icon_razz.gif',
+           ':o' => 'icon_surprised.gif',
+           ':x' => 'icon_mad.gif',
+           ':|' => 'icon_neutral.gif',
+           ';)' => 'icon_wink.gif',
+          ':!:' => 'icon_exclaim.gif',
+          ':?:' => 'icon_question.gif',
+    );
+}
+// generates smilies' search & replace arrays
+foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
+    $wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\s|$)/';
+    $smiley_masked = htmlspecialchars(trim($smiley), ENT_QUOTES);
+    $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
+}
+$is_apache = ((strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) || (strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false)) ? true : false;
+$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? true : false;
 ?>

tags/2.2/wp-includes/version.php

-                      r5468
+                      r5480
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 $wp_version = '2.1.3';
 $wp_db_version = 4773;
+$wp_version = '2.2';
+$wp_db_version = 5183;
 ?>

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

-                      r5468
+                      r5480
     var $postmeta;
+    var $charset;
+    var $collate;
     /**
      * Connects to the database server and selects a database
 …
         return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
+    }
     function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
         register_shutdown_function(array(&$this, "__destruct"));
+        if ( defined('DB_CHARSET') )
+            $this->charset = DB_CHARSET;
+        if ( defined('DB_COLLATE') )
+            $this->collate = DB_COLLATE;
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword);
 …
+        }
+        if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+            $this->query("SET NAMES '$this->charset'");
         $this->select($dbname);
+    }
     function __destruct() {
         return true;
+        return true;
+    }
 …
         $this->result = @mysql_query($query, $this->dbh);
         ++$this->num_queries;
         if (SAVEQUERIES)
             $this->queries[] = array( $query, $this->timer_stop() );
 …
         if ( preg_match("/^\\s*(insert|delete|update|replace) /i",$query) ) {
             $this->rows_affected = mysql_affected_rows();
+            $this->rows_affected = mysql_affected_rows($this->dbh);
             // Take note of the insert_id
             if ( preg_match("/^\\s*(insert|replace) /i",$query) ) {
 …
         if ( $query )
             $this->query($query);
         if ( !isset($this->last_result[$y]) )
             return null;
 …
         header('Content-Type: text/html; charset=utf-8');
         if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+        if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
             $admin_dir = '';
         else

tags/2.2/wp-links-opml.php

-                      r5468
+                      r5480
 <opml version="1.0">
     <head>
         <title>Links for <?php echo get_bloginfo('name').$cat_name ?></title>
+        <title>Links for <?php echo attribute_escape(get_bloginfo('name').$cat_name); ?></title>
         <dateCreated><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</dateCreated>
     </head>
 …
 foreach ((array) $cats as $cat) {
+    $catname = apply_filters('link_category', $cat->cat_name);
 ?>
 <outline type="category" title="<?php echo attribute_escape($cat->cat_name); ?>">
+<outline type="category" title="<?php echo attribute_escape($catname); ?>">
 <?php
     $bookmarks = get_bookmarks("category={$cat->cat_ID}");
     foreach ((array) $bookmarks as $bookmark) {
+        $title = attribute_escape(apply_filters('link_title', $bookmark->link_name));
 ?>
     <outline text="<?php echo attribute_escape($bookmark->link_name); ?>" type="link" xmlUrl="<?php echo attribute_escape($bookmark->link_rss); ?>" htmlUrl="<?php echo attribute_escape($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" />
+    <outline text="<?php echo $title; ?>" type="link" xmlUrl="<?php echo attribute_escape($bookmark->link_rss); ?>" htmlUrl="<?php echo attribute_escape($bookmark->link_url); ?>" updated="<?php if ('0000-00-00 00:00:00' != $bookmark->link_updated) echo $bookmark->link_updated; ?>" />
 <?php

tags/2.2/wp-login.php

-                      r5468
+                      r5480
 <body class="login">
 <div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
+<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', __('Powered by WordPress')); ?>"><?php bloginfo('name'); ?></a></h1>
 <?php
     if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n";
 …
         do_action('lostpassword_post');
         if ( empty( $errors ) ) {
             $user_data = get_userdatabylogin(trim($_POST['user_login']));
 …
     </p>
 <?php do_action('lostpassword_form'); ?>
     <p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Get New Password &raquo;'); ?>" tabindex="100" /></p>
+    <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Get New Password &raquo;'); ?>" tabindex="100" /></p>
 </form>
 </div>
 …
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+    <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
 <?php else : ?>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+    <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
 <?php endif; ?>
 …
     } else {
         // send a copy of password change notification to the admin
+        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
+        // but check to see if it's the admin whose password we're changing, and skip this
+        if ($user->user_email != get_option('admin_email')) {
+            $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+            wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
+        }
         wp_redirect('wp-login.php?checkemail=newpass');
 …
 <?php do_action('register_form'); ?>
     <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
     <p class="submit"><input type="submit" name="submit" id="submit" value="<?php _e('Register &raquo;'); ?>" tabindex="100" /></p>
+    <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Register &raquo;'); ?>" tabindex="100" /></p>
 </form>
 </div>
 …
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php"><?php _e('Login') ?></a></li>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+    <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
 </ul>
 …
+        }
+    }
     if ( $_POST && empty( $user_login ) )
         $errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');
 …
     <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember me'); ?></label></p>
     <p class="submit">
         <input type="submit" name="submit" id="submit" value="<?php _e('Login'); ?> &raquo;" tabindex="100" />
+        <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e('Login'); ?> &raquo;" tabindex="100" />
         <input type="hidden" name="redirect_to" value="<?php echo attribute_escape($redirect_to); ?>" />
     </p>
 …
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=register"><?php _e('Register') ?></a></li>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+    <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
 <?php else : ?>
     <li><a href="<?php bloginfo('home'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
+    <li><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('Back to %s'), get_bloginfo('title')); ?></a></li>
     <li><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=lostpassword" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a></li>
 <?php endif; ?>

tags/2.2/wp-mail.php

-                      r5468
+                      r5480
     $content = '';
     $content_type = '';
+    $content_transfer_encoding = '';
     $boundary = '';
     $bodysignal = 0;
+    $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                     'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
+    $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
     foreach ($message as $line) :
         if (strlen($line) < 3) $bodysignal = 1;
 …
                 $content_type = explode(';', $content_type);
                 $content_type = $content_type[0];
+            }
+            if (preg_match('/Content-Transfer-Encoding: /i', $line)) {
+                $content_transfer_encoding = trim($line);
+                $content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding)-14);
+                $content_transfer_encoding = explode(';', $content_transfer_encoding);
+                $content_transfer_encoding = $content_transfer_encoding[0];
+            }
             if (($content_type == 'multipart/alternative') && (preg_match('/boundary="/', $line)) && ($boundary == '')) {
 …
             // Set the author using the email address (To or Reply-To, the last used)
             // otherwise use the site admin
             if (preg_match('/From: /', $line) | preg_match('Reply-To: /', $line))  {
+            if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line))  {
                 $author=trim($line);
             if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) {
 …
+    }
     $content = trim($content);
+    if (stripos($content_transfer_encoding, "quoted-printable") !== false) {
+        $content = quoted_printable_decode($content);
+    }
     // Captures any text in the body after $phone_delim as the body
     $content = explode($phone_delim, $content);
     $content[1] ? $content = $content[1] : $content = $content[0];
     echo "<p><b>Content-type:</b> $content_type, <b>boundary:</b> $boundary</p>\n";
+    echo "<p><b>Content-type:</b> $content_type, <b>Content-Transfer-Encoding:</b> $content_transfer_encoding, <b>boundary:</b> $boundary</p>\n";
     echo "<p><b>Raw content:</b><br /><pre>".$content.'</pre></p>';

tags/2.2/wp-rdf.php

-                      r5468
+                      r5480
+}
+header('Content-type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
+$more = 1;
+require (ABSPATH . WPINC . '/feed-rdf.php');
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
-<rdf:RDF
-    xmlns="http://purl.org/rss/1.0/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-    xmlns:admin="http://webns.net/mvcb/"
-    xmlns:content="http://purl.org/rss/1.0/modules/content/"
-    <?php do_action('rdf_ns'); ?>
+>
-<channel rdf:about="<?php bloginfo_rss("url") ?>">
-    <title><?php bloginfo_rss('name') ?></title>
-    <link><?php bloginfo_rss('url') ?></link>
-    <description><?php bloginfo_rss('description') ?></description>
-    <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>
-    <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $wp_version ?>"/>
-    <sy:updatePeriod>hourly</sy:updatePeriod>
-    <sy:updateFrequency>1</sy:updateFrequency>
-    <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-    <?php do_action('rdf_header'); ?>
-    <items>
-        <rdf:Seq>
-        <?php while (have_posts()): the_post(); ?>
-            <rdf:li rdf:resource="<?php permalink_single_rss() ?>"/>
-        <?php endwhile; ?>
-        </rdf:Seq>
-    </items>
-</channel>
-<?php rewind_posts(); while (have_posts()): the_post(); ?>
-<item rdf:about="<?php permalink_single_rss() ?>">
-    <title><?php the_title_rss() ?></title>
-    <link><?php permalink_single_rss() ?></link>
-     <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', $post->post_date_gmt, false); ?></dc:date>
-    <dc:creator><?php the_author() ?></dc:creator>
-    <?php the_category_rss('rdf') ?>
-<?php if (get_option('rss_use_excerpt')) : ?>
-    <description><?php the_excerpt_rss() ?></description>
-<?php else : ?>
-    <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length'), 2) ?></description>
-    <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
-<?php endif; ?>
-    <?php do_action('rdf_item'); ?>
-</item>
-<?php endwhile;  ?>
-</rdf:RDF>

tags/2.2/wp-rss.php

-                      r5468
+                      r5480
+}
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
+$more = 1;
+require (ABSPATH . WPINC . '/feed-rss.php');
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
-<rss version="0.92">
-<channel>
-    <title><?php bloginfo_rss('name') ?></title>
-    <link><?php bloginfo_rss('url') ?></link>
-    <description><?php bloginfo_rss('description') ?></description>
-    <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
-    <docs>http://backend.userland.com/rss092</docs>
-    <language><?php echo get_option('rss_language'); ?></language>
-    <?php do_action('rss_head'); ?>
-<?php while (have_posts()) : the_post(); ?>
-    <item>
-        <title><?php the_title_rss() ?></title>
-<?php if (get_option('rss_use_excerpt')) { ?>
-        <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php } else { // use content ?>
-        <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length')) ?></description>
-<?php } ?>
-        <link><?php permalink_single_rss() ?></link>
-        <?php do_action('rss_item'); ?>
-    </item>
-<?php endwhile; ?>
-</channel>
-</rss>

tags/2.2/wp-rss2.php

-                      r5468
+                      r5480
+}
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
+$more = 1;
+require (ABSPATH . WPINC . '/feed-rss2.php');
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<!-- generator="wordpress/<?php bloginfo_rss('version') ?>" -->
-<rss version="2.0"
-    xmlns:content="http://purl.org/rss/1.0/modules/content/"
-    xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    <?php do_action('rss2_ns'); ?>
+>
-<channel>
-    <title><?php bloginfo_rss('name'); ?></title>
-    <link><?php bloginfo_rss('url') ?></link>
-    <description><?php bloginfo_rss("description") ?></description>
-    <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate>
-    <generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
-    <language><?php echo get_option('rss_language'); ?></language>
-    <?php do_action('rss2_head'); ?>
-    <?php while( have_posts()) : the_post(); ?>
-    <item>
-        <title><?php the_title_rss() ?></title>
-        <link><?php permalink_single_rss() ?></link>
-        <comments><?php comments_link(); ?></comments>
-        <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
-        <dc:creator><?php the_author() ?></dc:creator>
-        <?php the_category_rss() ?>
-        <guid isPermaLink="false"><?php the_guid(); ?></guid>
-<?php if (get_option('rss_use_excerpt')) : ?>
-        <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php else : ?>
-        <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-    <?php if ( strlen( $post->post_content ) > 0 ) : ?>
-        <content:encoded><![CDATA[<?php the_content() ?>]]></content:encoded>
-    <?php else : ?>
-        <content:encoded><![CDATA[<?php the_excerpt_rss() ?>]]></content:encoded>
-    <?php endif; ?>
-<?php endif; ?>
-        <wfw:commentRss><?php echo comments_rss(); ?></wfw:commentRss>
-<?php rss_enclosure(); ?>
-    <?php do_action('rss2_item'); ?>
-    </item>
-    <?php endwhile; ?>
-</channel>
-</rss>

tags/2.2/wp-settings.php

-                      r5468
+                      r5480
 // Fix for Dreamhost and other PHP as CGI hosts
 if ( strstr( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) )
+if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
     unset($_SERVER['PATH_INFO']);
 …
     $wpdb->usermeta = CUSTOM_USER_META_TABLE;
-// To be removed in 2.2
-$tableposts = $tableusers = $tablecategories = $tablepost2cat = $tablecomments = $tablelink2cat = $tablelinks = $tablelinkcategories = $tableoptions = $tablepostmeta = '';
 if ( file_exists(ABSPATH . 'wp-content/object-cache.php') )
     require (ABSPATH . 'wp-content/object-cache.php');
 …
 require (ABSPATH . WPINC . '/functions.php');
+require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/plugin.php');
 require (ABSPATH . WPINC . '/default-filters.php');
 …
 require_once (ABSPATH . WPINC . '/l10n.php');
 if ( !is_blog_installed() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) {
     if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+if ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
         $link = 'install.php';
     else
 …
 require (ABSPATH . WPINC . '/formatting.php');
 require (ABSPATH . WPINC . '/capabilities.php');
-require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/query.php');
 require (ABSPATH . WPINC . '/theme.php');
 …
 require (ABSPATH . WPINC . '/script-loader.php');
 if (!strstr($_SERVER['PHP_SELF'], 'install.php')) :
+if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {
     // Used to guarantee unique hash cookies
     $cookiehash = md5(get_option('siteurl'));
     define('COOKIEHASH', $cookiehash);
+endif;
+}
 if ( !defined('USER_COOKIE') )
 …
     if ( is_array($current_plugins) ) {
         foreach ($current_plugins as $plugin) {
             if ('' != $plugin && file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
                 include_once(ABSPATH . 'wp-content/plugins/' . $plugin);
+            if ('' != $plugin && file_exists(ABSPATH . PLUGINDIR . '/' . $plugin))
+                include_once(ABSPATH . PLUGINDIR . '/' . $plugin);
+        }
+    }

tags/2.2/wp-trackback.php

r5468	r5480
67	67	}
68	68
69		if ( !empty($tb_url) && !empty($title) ~~&& !empty($tb_url)~~ ) {
	69	if ( !empty($tb_url) && !empty($title) ) {
70	70	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
71	71

tags/2.2/xmlrpc.php

-                      r5468
+                      r5480
 // Some browser-embedded clients send cookies. We don't want them.
 $_COOKIE = array();
+// A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
+// but we can do it ourself.
+if ( !isset( $HTTP_RAW_POST_DATA ) ) {
+    $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+}
 # fix for mozBlog and other cases where '<?xml' isn't on the very first line
 …
     <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
     <apis>
+      <api name="WordPress" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
       <api name="Movable Type" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
 …
     function wp_xmlrpc_server() {
         $this->methods = array(
+            // WordPress API
+            'wp.getPage'            => 'this:wp_getPage',
+            'wp.getPages'           => 'this:wp_getPages',
+            'wp.newPage'            => 'this:wp_newPage',
+            'wp.deletePage'         => 'this:wp_deletePage',
+            'wp.editPage'           => 'this:wp_editPage',
+            'wp.getPageList'        => 'this:wp_getPageList',
+            'wp.getAuthors'         => 'this:wp_getAuthors',
+            'wp.getCategories'      => 'this:mw_getCategories',     // Alias
+            'wp.newCategory'        => 'this:wp_newCategory',
+            'wp.suggestCategories'  => 'this:wp_suggestCategories',
+            'wp.uploadFile'         => 'this:mw_newMediaObject',    // Alias
             // Blogger API
             'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
 …
     function login_pass_ok($user_login, $user_pass) {
         if (!user_pass_ok($user_login, $user_pass)) {
             $this->error = new IXR_Error(403, 'Bad login/pass combination.');
+            $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
             return false;
+        }
 …
         global $wpdb;
+        foreach ( (array) $array as $k => $v ) {
+            if (is_array($v)) {
+                $this->escape($array[$k]);
+            } else if (is_object($v)) {
+                //skip
+            } else {
+                $array[$k] = $wpdb->escape($v);
+        if(!is_array($array)) {
+            return($wpdb->escape($array));
+        }
+        else {
+            foreach ( (array) $array as $k => $v ) {
+                if (is_array($v)) {
+                    $this->escape($array[$k]);
+                } else if (is_object($v)) {
+                    //skip
+                } else {
+                    $array[$k] = $wpdb->escape($v);
+                }
+            }
+        }
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_getPage
+     */
+    function wp_getPage($args) {
+        $this->escape($args);
+        $blog_id    = (int) $args[0];
+        $page_id    = (int) $args[1];
+        $username   = $args[2];
+        $password   = $args[3];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Lookup page info.
+        $page = get_page($page_id);
+        // If we found the page then format the data.
+        if($page->ID && ($page->post_type == "page")) {
+            // Get all of the page content and link.
+            $full_page = get_extended($page->post_content);
+            $link = post_permalink($page->ID);
+            // Get info the page parent if there is one.
+            $parent_title = "";
+            if(!empty($page->post_parent)) {
+                $parent = get_page($page->post_parent);
+                $parent_title = $parent->post_title;
+            }
+            // Determine comment and ping settings.
+            $allow_comments = ("open" == $page->comment_status) ? 1 : 0;
+            $allow_pings = ("open" == $page->ping_status) ? 1 : 0;
+            // Format page date.
+            $page_date = mysql2date("Ymd\TH:i:s", $page->post_date_gmt);
+            // Pull the categories info together.
+            $categories = array();
+            foreach(wp_get_post_categories($page->ID) as $cat_id) {
+                $categories[] = get_cat_name($cat_id);
+            }
+            // Get the author info.
+            $author = get_userdata($page->post_author);
+            $page_struct = array(
+                "dateCreated"           => new IXR_Date($page_date),
+                "userid"                => $page->post_author,
+                "page_id"               => $page->ID,
+                "page_status"           => $page->post_status,
+                "description"           => $full_page["main"],
+                "title"                 => $page->post_title,
+                "link"                  => $link,
+                "permaLink"             => $link,
+                "categories"            => $categories,
+                "excerpt"               => $page->post_excerpt,
+                "text_more"             => $full_page["extended"],
+                "mt_allow_comments"     => $allow_comments,
+                "mt_allow_pings"        => $allow_pings,
+                "wp_slug"               => $page->post_name,
+                "wp_password"           => $page->post_password,
+                "wp_author"             => $author->display_name,
+                "wp_page_parent_id"     => $page->post_parent,
+                "wp_page_parent_title"  => $parent_title,
+                "wp_page_order"         => $page->menu_order,
+                "wp_author_id"          => $author->ID,
+                "wp_author_display_name"    => $author->display_name
+            );
+            return($page_struct);
+        }
+        // If the page doesn't exist indicate that.
+        else {
+            return(new IXR_Error(404, __("Sorry, no such page.")));
+        }
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_getPages
+     */
+    function wp_getPages($args) {
+        $this->escape($args);
+        $blog_id    = (int) $args[0];
+        $username   = $args[1];
+        $password   = $args[2];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Lookup info on pages.
+        $pages = get_pages();
+        $num_pages = count($pages);
+        // If we have pages, put together their info.
+        if($num_pages >= 1) {
+            $pages_struct = array();
+            for($i = 0; $i < $num_pages; $i++) {
+                $page = wp_xmlrpc_server::wp_getPage(array(
+                    $blog_id, $pages[$i]->ID, $username, $password
+                ));
+                $pages_struct[] = $page;
+            }
+            return($pages_struct);
+        }
+        // If no pages were found return an error.
+        else {
+            return(array());
+        }
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_newPage
+     */
+    function wp_newPage($args) {
+        // Items not escaped here will be escaped in newPost.
+        $username   = $this->escape($args[1]);
+        $password   = $this->escape($args[2]);
+        $page       = $args[3];
+        $publish    = $args[4];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Set the user context and check if they are allowed
+        // to add new pages.
+        $user = set_current_user(0, $username);
+        if(!current_user_can("publish_pages")) {
+            return(new IXR_Error(401, __("Sorry, you can not add new pages.")));
+        }
+        // Mark this as content for a page.
+        $args[3]["post_type"] = "page";
+        // Let mw_newPost do all of the heavy lifting.
+        return($this->mw_newPost($args));
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_deletePage
+     */
+    function wp_deletePage($args) {
+        $this->escape($args);
+        $blog_id    = (int) $args[0];
+        $username   = $args[1];
+        $password   = $args[2];
+        $page_id    = (int) $args[3];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Get the current page based on the page_id and
+        // make sure it is a page and not a post.
+        $actual_page = wp_get_single_post($page_id, ARRAY_A);
+        if(
+            !$actual_page
+            || ($actual_page["post_type"] != "page")
+        ) {
+            return(new IXR_Error(404, __("Sorry, no such page.")));
+        }
+        // Set the user context and make sure they can delete pages.
+        set_current_user(0, $username);
+        if(!current_user_can("delete_page", $page_id)) {
+            return(new IXR_Error(401, __("Sorry, you do not have the right to delete this page.")));
+        }
+        // Attempt to delete the page.
+        $result = wp_delete_post($page_id);
+        if(!$result) {
+            return(new IXR_Error(500, __("Failed to delete the page.")));
+        }
+        return(true);
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_editPage
+     */
+    function wp_editPage($args) {
+        // Items not escaped here will be escaped in editPost.
+        $blog_id    = (int) $args[0];
+        $page_id    = (int) $this->escape($args[1]);
+        $username   = $this->escape($args[2]);
+        $password   = $this->escape($args[3]);
+        $content    = $args[4];
+        $publish    = $args[5];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Get the page data and make sure it is a page.
+        $actual_page = wp_get_single_post($page_id, ARRAY_A);
+        if(
+            !$actual_page
+            || ($actual_page["post_type"] != "page")
+        ) {
+            return(new IXR_Error(404, __("Sorry, no such page.")));
+        }
+        // Set the user context and make sure they are allowed to edit pages.
+        set_current_user(0, $username);
+        if(!current_user_can("edit_page", $page_id)) {
+            return(new IXR_Error(401, __("Sorry, you do not have the right to edit this page.")));
+        }
+        // Mark this as content for a page.
+        $content["post_type"] = "page";
+        // Arrange args in the way mw_editPost understands.
+        $args = array(
+            $page_id,
+            $username,
+            $password,
+            $content,
+            $publish
+        );
+        // Let mw_editPost do all of the heavy lifting.
+        return($this->mw_editPost($args));
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_getPageList
+     */
+    function wp_getPageList($args) {
+        global $wpdb;
+        $this->escape($args);
+        $blog_id                = (int) $args[0];
+        $username               = $args[1];
+        $password               = $args[2];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Get list of pages ids and titles
+        $page_list = $wpdb->get_results("
+            SELECT ID page_id,
+                post_title page_title,
+                post_parent page_parent_id,
+                post_date_gmt
+            FROM {$wpdb->posts}
+            WHERE post_type = 'page'
+            ORDER BY ID
+        ");
+        // The date needs to be formated properly.
+        $num_pages = count($page_list);
+        for($i = 0; $i < $num_pages; $i++) {
+            $post_date = mysql2date("Ymd\TH:i:s", $page_list[$i]->post_date_gmt);
+            $page_list[$i]->dateCreated = new IXR_Date($post_date);
+            unset($page_list[$i]->post_date_gmt);
+        }
+        return($page_list);
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_getAuthors
+     */
+    function wp_getAuthors($args) {
+        global $wpdb;
+        $this->escape($args);
+        $blog_id    = (int) $args[0];
+        $username   = $args[1];
+        $password   = $args[2];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        return(get_users_of_blog());
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_newCategory
+     */
+    function wp_newCategory($args) {
+        $this->escape($args);
+        $blog_id                = (int) $args[0];
+        $username               = $args[1];
+        $password               = $args[2];
+        $category               = $args[3];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Set the user context and make sure they are
+        // allowed to add a category.
+        set_current_user(0, $username);
+        if(!current_user_can("manage_categories", $page_id)) {
+            return(new IXR_Error(401, __("Sorry, you do not have the right to add a category.")));
+        }
+        // We need this to make use of the wp_insert_category()
+        // funciton.
+        require_once(ABSPATH . "wp-admin/admin-db.php");
+        // If no slug was provided make it empty so that
+        // WordPress will generate one.
+        if(empty($category["slug"])) {
+            $category["slug"] = "";
+        }
+        // If no parent_id was provided make it empty
+        // so that it will be a top level page (no parent).
+        if ( !isset($category["parent_id"]) )
+            $category["parent_id"] = "";
+        // If no description was provided make it empty.
+        if(empty($category["description"])) {
+            $category["description"] = "";
+        }
+        $new_category = array(
+            "cat_name"              => $category["name"],
+            "category_nicename"     => $category["slug"],
+            "category_parent"       => $category["parent_id"],
+            "category_description"  => $category["description"]
+        );
+        $cat_id = wp_insert_category($new_category);
+        if(!$cat_id) {
+            return(new IXR_Error(500, __("Sorry, the new category failed.")));
+        }
+        return($cat_id);
+    }
+    /**
+     * WordPress XML-RPC API
+     * wp_suggestCategories
+     */
+    function wp_suggestCategories($args) {
+        global $wpdb;
+        $this->escape($args);
+        $blog_id                = (int) $args[0];
+        $username               = $args[1];
+        $password               = $args[2];
+        $category               = $args[3];
+        $max_results            = $args[4];
+        if(!$this->login_pass_ok($username, $password)) {
+            return($this->error);
+        }
+        // Only set a limit if one was provided.
+        $limit = "";
+        if(!empty($max_results)) {
+            $limit = "LIMIT {$max_results}";
+        }
+        $category_suggestions = $wpdb->get_results("
+            SELECT cat_ID category_id,
+                cat_name category_name
+            FROM {$wpdb->categories}
+            WHERE cat_name LIKE '{$category}%'
+            {$limit}
+        ");
+        return($category_suggestions);
+    }
     /* Blogger API functions
 …
         $this->escape($args);
       $user_login = $args[1];
       $user_pass  = $args[2];
       if (!$this->login_pass_ok($user_login, $user_pass)) {
         return $this->error;
+      }
       set_current_user(0, $user_login);
       $is_admin = current_user_can('level_8');
       $struct = array(
         'isAdmin'  => $is_admin,
         'url'      => get_option('home') . '/',
         'blogid'   => '1',
         'blogName' => get_option('blogname')
       );
       return array($struct);
+        $user_login = $args[1];
+        $user_pass  = $args[2];
+        if (!$this->login_pass_ok($user_login, $user_pass)) {
+            return $this->error;
+        }
+        set_current_user(0, $user_login);
+        $is_admin = current_user_can('level_8');
+        $struct = array(
+            'isAdmin'  => $is_admin,
+            'url'      => get_option('home') . '/',
+            'blogid'   => '1',
+            'blogName' => get_option('blogname')
+        );
+        return array($struct);
+    }
 …
         if (!$posts_list) {
             $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
+            $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
             return $this->error;
+        }
 …
       set_current_user(0, $user_login);
       if ( !current_user_can('edit_themes') ) {
         return new IXR_Error(401, 'Sorry, this user can not edit the template.');
+        return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
+      }
 …
       set_current_user(0, $user_login);
       if ( !current_user_can('edit_themes') ) {
         return new IXR_Error(401, 'Sorry, this user can not edit the template.');
+        return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
+      }
 …
         fclose($f);
       } else {
         return new IXR_Error(500, 'Either the file is not writable, or something wrong happened. The file has not been updated.');
+        return new IXR_Error(500, __('Either the file is not writable, or something wrong happened. The file has not been updated.'));
+      }
 …
       $user = set_current_user(0, $user_login);
       if ( !current_user_can($cap) )
         return new IXR_Error(401, 'Sorry, you can not post on this weblog or category.');
+        return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.'));
       $post_status = ($publish) ? 'publish' : 'draft';
 …
       if (!$post_ID) {
         return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.');
+        return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+      }
       $this->attach_uploads( $post_ID, $post_content );
 …
       if (!$actual_post) {
         return new IXR_Error(404, 'Sorry, no such post.');
+        return new IXR_Error(404, __('Sorry, no such post.'));
+      }
 …
       set_current_user(0, $user_login);
       if ( !current_user_can('edit_post', $post_ID) )
         return new IXR_Error(401, 'Sorry, you do not have the right to edit this post.');
+        return new IXR_Error(401, __('Sorry, you do not have the right to edit this post.'));
       extract($actual_post);
       if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
         return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+        return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
       $post_title = xmlrpc_getposttitle($content);
 …
       if (!$result) {
         return new IXR_Error(500, 'For some strange yet very annoying reason, this post could not be edited.');
+        return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+      }
       $this->attach_uploads( $ID, $post_content );
 …
       if (!$actual_post) {
         return new IXR_Error(404, 'Sorry, no such post.');
+        return new IXR_Error(404, __('Sorry, no such post.'));
+      }
       set_current_user(0, $user_login);
       if ( !current_user_can('edit_post', $post_ID) )
         return new IXR_Error(401, 'Sorry, you do not have the right to delete this post.');
+        return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
       $result = wp_delete_post($post_ID);
       if (!$result) {
         return new IXR_Error(500, 'For some strange yet very annoying reason, this post could not be deleted.');
+        return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be deleted.'));
+      }
 …
       $user = set_current_user(0, $user_login);
       if ( !current_user_can('publish_posts') )
+        return new IXR_Error(401, 'Sorry, you can not post on this weblog or category.');
+        return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.'));
+        // The post_type defaults to post, but could also be page.
+        $post_type = "post";
+        if(
+            !empty($content_struct["post_type"])
+            && ($content_struct["post_type"] == "page")
+        ) {
+            $post_type = "page";
+        }
+        // Let WordPress generate the post_name (slug) unless
+        // one has been provided.
+        $post_name = "";
+        if(isset($content_struct["wp_slug"])) {
+            $post_name = $content_struct["wp_slug"];
+        }
+        // Only use a password if one was given.
+        if(isset($content_struct["wp_password"])) {
+            $post_password = $content_struct["wp_password"];
+        }
+        // Only set a post parent if one was provided.
+        if(isset($content_struct["wp_page_parent_id"])) {
+            $post_parent = $content_struct["wp_page_parent_id"];
+        }
+        // Only set the menu_order if it was provided.
+        if(isset($content_struct["wp_page_order"])) {
+            $menu_order = $content_struct["wp_page_order"];
+        }
       $post_author = $user->ID;
+        // If an author id was provided then use it instead.
+        if(
+            isset($content_struct["wp_author_id"])
+            && ($user->ID != $content_struct["wp_author_id"])
+        ) {
+            switch($post_type) {
+                case "post":
+                    if(!current_user_can("edit_others_posts")) {
+                        return(new IXR_Error(401, "You are not allowed to " .
+                            "post as this user"));
+                    }
+                    break;
+                case "page":
+                    if(!current_user_can("edit_others_pages")) {
+                        return(new IXR_Error(401, "You are not allowed to " .
+                            "create pages as this user"));
+                    }
+                    break;
+                default:
+                    return(new IXR_Error(401, __("Invalid post type.")));
+                    break;
+            }
+            $post_author = $content_struct["wp_author_id"];
+        }
       $post_title = $content_struct['title'];
 …
       $post_more = $content_struct['mt_text_more'];
+      $comment_status = (empty($content_struct['mt_allow_comments'])) ?
+        get_option('default_comment_status')
+        : $content_struct['mt_allow_comments'];
+      $ping_status = (empty($content_struct['mt_allow_pings'])) ?
+        get_option('default_ping_status')
+        : $content_struct['mt_allow_pings'];
+        if(isset($content_struct["mt_allow_comments"])) {
+            switch((int) $content_struct["mt_allow_comments"]) {
+                case 0:
+                    $comment_status = "closed";
+                    break;
+                case 1:
+                    $comment_status = "open";
+                    break;
+                default:
+                    $comment_status = get_option("default_comment_status");
+                    break;
+            }
+        }
+        if(isset($content_struct["mt_allow_pings"])) {
+            switch((int) $content_struct["mt_allow_pings"]) {
+                case 0:
+                    $ping_status = "closed";
+                    break;
+                case 1:
+                    $ping_status = "open";
+                    break;
+                default:
+                    $ping_status = get_option("default_ping_status");
+                    break;
+            }
+        }
       if ($post_more) {
 …
         $dateCreated = $dateCreatedd->getIso();
         $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
         $post_date_gmt = iso8601_to_datetime($dateCreated, GMT);
+        $post_date_gmt = iso8601_to_datetime($dateCreated. "Z", GMT);
       } else {
         $post_date     = current_time('mysql');
 …
       // We've got all the data -- post it:
       $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping');
+      $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order');
       $post_ID = wp_insert_post($postdata);
       if (!$post_ID) {
         return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.');
+        return new IXR_Error(500, __('Sorry, your entry could not be posted. Something wrong happened.'));
+      }
 …
+      }
+      set_current_user(0, $user_login);
+      if ( !current_user_can('edit_post', $post_ID) )
+        return new IXR_Error(401, 'Sorry, you can not edit this post.');
+        $user = set_current_user(0, $user_login);
+        // The post_type defaults to post, but could also be page.
+        $post_type = "post";
+        if(
+            !empty($content_struct["post_type"])
+            && ($content_struct["post_type"] == "page")
+        ) {
+            $post_type = "page";
+        }
+      // Edit page caps are checked in editPage.  Just check post here.
+      if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
+        return new IXR_Error(401, __('Sorry, you can not edit this post.'));
       $postdata = wp_get_single_post($post_ID, ARRAY_A);
+        // If there is no post data for the give post id, stop
+        // now and return an error.  Other wise a new post will be
+        // created (which was the old behavior).
+        if(empty($postdata["ID"])) {
+            return(new IXR_Error(404, __("Invalid post id.")));
+        }
       extract($postdata);
         $this->escape($postdata);
+        // Let WordPress manage slug if none was provided.
+        $post_name = "";
+        if(isset($content_struct["wp_slug"])) {
+            $post_name = $content_struct["wp_slug"];
+        }
+        // Only use a password if one was given.
+        if(isset($content_struct["wp_password"])) {
+            $post_password = $content_struct["wp_password"];
+        }
+        // Only set a post parent if one was given.
+        if(isset($content_struct["wp_page_parent_id"])) {
+            $post_parent = $content_struct["wp_page_parent_id"];
+        }
+        // Only set the menu_order if it was given.
+        if(isset($content_struct["wp_page_order"])) {
+            $menu_order = $content_struct["wp_page_order"];
+        }
+        $post_author = $user->ID;
+        // Only set the post_author if one is set.
+        if(
+            isset($content_struct["wp_author_id"])
+            && ($user->ID != $content_struct["wp_author_id"])
+        ) {
+            switch($post_type) {
+                case "post":
+                    if(!current_user_can("edit_others_posts")) {
+                        return(new IXR_Error(401, "You are not allowed to " .
+                            "change the post author as this user."));
+                    }
+                    break;
+                case "page":
+                    if(!current_user_can("edit_others_pages")) {
+                        return(new IXR_Error(401, "You are not allowed to " .
+                            "change the page author as this user."));
+                    }
+                    break;
+                default:
+                    return(new IXR_Error(401, __("Invalid post type.")));
+                    break;
+            }
+            $post_author = $content_struct["wp_author_id"];
+        }
+        // Only set ping_status if it was provided.
+        if(isset($content_struct["mt_allow_pings"])) {
+            switch((int) $content_struct["mt_allow_pings"]) {
+                case 0:
+                    $ping_status = "closed";
+                    break;
+                case 1:
+                    $ping_status = "open";
+                    break;
+            }
+        }
       $post_title = $content_struct['title'];
 …
       $post_status = $publish ? 'publish' : 'draft';
+      if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
+        return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+      if ( ('publish' == $post_status) ) {
+        if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
+            return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
+        else if ( !current_user_can('publish_posts') )
+            return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
+      }
       if ($post_more) {
 …
       if ( is_array($to_ping) )
         $to_ping = implode(' ', $to_ping);
+      if(isset($content_struct["mt_allow_comments"])) {
+        $comment_status = (int) $content_struct["mt_allow_comments"];
+      }
-      $comment_status = (empty($content_struct['mt_allow_comments'])) ?
-        get_option('default_comment_status')
-        : $content_struct['mt_allow_comments'];
-      $ping_status = (empty($content_struct['mt_allow_pings'])) ?
-        get_option('default_ping_status')
-        : $content_struct['mt_allow_pings'];
       // Do some timestamp voodoo
       $dateCreatedd = $content_struct['dateCreated'];
 …
         $dateCreated = $dateCreatedd->getIso();
         $post_date     = get_date_from_gmt(iso8601_to_datetime($dateCreated));
         $post_date_gmt = iso8601_to_datetime($dateCreated, GMT);
+        $post_date_gmt = iso8601_to_datetime($dateCreated . "Z", GMT);
       } else {
         $post_date     = $postdata['post_date'];
 …
       // We've got all the data -- post it:
       $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping');
+      $newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author');
       $result = wp_update_post($newpost);
       if (!$result) {
         return new IXR_Error(500, 'Sorry, your entry could not be edited. Something wrong happened.');
+        return new IXR_Error(500, __('Sorry, your entry could not be edited. Something wrong happened.'));
+      }
       $this->attach_uploads( $ID, $post_content );
 …
       if ($postdata['post_date'] != '') {
         $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date']);
+        $post_date = mysql2date('Ymd\TH:i:s', $postdata['post_date_gmt']);
         $categories = array();
 …
         $post = get_extended($postdata['post_content']);
         $link = post_permalink($postdata['ID']);
+        // Get the author info.
+        $author = get_userdata($postdata['post_author']);
         $allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
 …
           'mt_text_more' => $post['extended'],
           'mt_allow_comments' => $allow_comments,
+          'mt_allow_pings' => $allow_pings
+          'mt_allow_pings' => $allow_pings,
+          'wp_slug' => $postdata['post_name'],
+          'wp_password' => $postdata['post_password'],
+          'wp_author_id' => $author->ID,
+          'wp_author_display_name'  => $author->display_name
         );
         return $resp;
       } else {
         return new IXR_Error(404, 'Sorry, no such post.');
+        return new IXR_Error(404, __('Sorry, no such post.'));
+      }
+    }
 …
         if (!$posts_list) {
             $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
+            $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
             return $this->error;
+        }
 …
         foreach ($posts_list as $entry) {
             $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+            $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
             $categories = array();
             $catids = wp_get_post_categories($entry['ID']);
 …
             $post = get_extended($entry['post_content']);
             $link = post_permalink($entry['ID']);
+            // Get the post author info.
+            $author = get_userdata($entry['post_author']);
             $allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
 …
                 'mt_text_more' => $post['extended'],
                 'mt_allow_comments' => $allow_comments,
+                'mt_allow_pings' => $allow_pings
+                'mt_allow_pings' => $allow_pings,
+                'wp_slug' => $entry['post_name'],
+                'wp_password' => $entry['post_password'],
+                'wp_author_id' => $author->ID,
+                'wp_author_display_name' => $author->display_name
             );
 …
         // FIXME: can we avoid using direct SQL there?
         if ($cats = $wpdb->get_results("SELECT cat_ID,cat_name FROM $wpdb->categories", ARRAY_A)) {
+        if ($cats = $wpdb->get_results("SELECT cat_ID,cat_name,category_parent FROM $wpdb->categories", ARRAY_A)) {
             foreach ($cats as $cat) {
                 $struct['categoryId'] = $cat['cat_ID'];
+                $struct['parentId'] = $cat['category_parent'];
                 $struct['description'] = $cat['cat_name'];
                 $struct['categoryName'] = $cat['cat_name'];
 …
         $bits = $data['bits'];
+        if(!empty($data["overwrite"]) && ($data["overwrite"] == true)) {
+            // Get postmeta info on the object.
+            $old_file = $wpdb->get_row("
+                SELECT ID
+                FROM {$wpdb->posts}
+                WHERE post_title = '{$name}'
+                    AND post_type = 'attachment'
+            ");
+            // Delete previous file.
+            wp_delete_attachment($old_file->ID);
+            // Make sure the new name is different by pre-pending the
+            // previous post id.
+            $filename = preg_replace("/^wpid\d+-/", "", $name);
+            $name = "wpid{$old_file->ID}-{$filename}";
+        }
         logIO('O', '(MW) Received '.strlen($bits).' bytes');
 …
         if ( !current_user_can('upload_files') ) {
             logIO('O', '(MW) User does not have upload_files capability');
             $this->error = new IXR_Error(401, 'You are not allowed to upload files to this site.');
+            $this->error = new IXR_Error(401, __('You are not allowed to upload files to this site.'));
             return $this->error;
+        }
 …
             return new IXR_Error(500, $upload_err);
         $upload = wp_upload_bits($name, $type, $bits);
+        $upload = wp_upload_bits($name, $type, $bits, $overwrite);
         if ( ! empty($upload['error']) ) {
             $errorString = 'Could not write file ' . $name . ' (' . $upload['error'] . ')';
 …
             'guid' => $upload[ 'url' ]
         );
         // Save the data
         $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
         wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
         return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );
+        return apply_filters( 'wp_handle_upload', array( 'file' => $name, 'url' => $upload[ 'url' ], 'type' => $type ) );
+    }
 …
         if (!$posts_list) {
             $this->error = new IXR_Error(500, 'Either there are no posts, or something went wrong.');
+            $this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
             return $this->error;
+        }
 …
         foreach ($posts_list as $entry) {
             $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date']);
+            $post_date = mysql2date('Ymd\TH:i:s', $entry['post_date_gmt']);
             $struct[] = array(
 …
         set_current_user(0, $user_login);
         if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you can not edit this post.');
+            return new IXR_Error(401, __('Sorry, you can not edit this post.'));
         foreach($categories as $cat) {
 …
          support per-post text filters yet */
     function mt_supportedTextFilters($args) {
         return array();
+        return apply_filters('xmlrpc_text_filters', array());
+    }
 …
         if (!$actual_post) {
             return new IXR_Error(404, 'Sorry, no such post.');
+            return new IXR_Error(404, __('Sorry, no such post.'));
+        }
 …
         set_current_user(0, $user_login);
         if ( !current_user_can('edit_post', $post_ID) )
             return new IXR_Error(401, 'Sorry, you can not edit this post.');
+            return new IXR_Error(401, __('Sorry, you can not edit this post.'));
         $postdata = wp_get_single_post($post_ID,ARRAY_A);
 …
         $pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
         if( !$pos1 )
                 return new IXR_Error(0, 'Is there no link to us?');
+                return new IXR_Error(0, __('Is there no link to us?'));
         // let's find which post is linked to
 …
         if ( $post_ID == url_to_postid($pagelinkedfrom) )
             return new IXR_Error(0, 'The source URL and the target URL cannot both point to the same resource.');
+            return new IXR_Error(0, __('The source URL and the target URL cannot both point to the same resource.'));
         // Check if pings are on
 …
         if ( $wpdb->num_rows ) // We already have a Pingback from this URL
             return new IXR_Error(48, 'The pingback has already been registered.');
+            return new IXR_Error(48, __('The pingback has already been registered.'));
         // very stupid, but gives time to the 'from' server to publish !
 …
         $linea = wp_remote_fopen( $pagelinkedfrom );
         if ( !$linea )
             return new IXR_Error(16, 'The source URL does not exist.');
+            return new IXR_Error(16, __('The source URL does not exist.'));
         // Work around bug in strip_tags():
 …
         $title = $matchtitle[1];
         if ( empty( $title ) )
             return new IXR_Error(32, 'We cannot find a title on that page.');
+            return new IXR_Error(32, __('We cannot find a title on that page.'));
         $linea = strip_tags( $linea, '<a>' ); // just keep the tag we need
 …
         if ( empty($context) ) // Link to target not found
             return new IXR_Error(17, 'The source URL does not contain a link to the target URL, and so cannot be used as a source.');
+            return new IXR_Error(17, __('The source URL does not contain a link to the target URL, and so cannot be used as a source.'));
         $pagelinkedfrom = preg_replace('#&([^amp\;])#is', '&amp;$1', $pagelinkedfrom);
 …
         if (!$actual_post) {
             // No such post = resource not found
             return new IXR_Error(32, 'The specified target URL does not exist.');
+            return new IXR_Error(32, __('The specified target URL does not exist.'));
+        }

Context Navigation

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

Legend: