Index: wp-login.php =================================================================== --- wp-login.php (.../2.3) (revision 6294) +++ wp-login.php (.../2.3.1) (revision 6294) @@ -22,6 +22,8 @@ //Set a cookie now to see if they are supported by the browser. setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); +if ( SITECOOKIEPATH != COOKIEPATH ) + setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); // Rather than duplicating this HTML all over the place, we'll stick it in function function login_header($title = 'Login', $message = '') { Index: wp-includes/default-filters.php =================================================================== --- wp-includes/default-filters.php (.../2.3) (revision 6294) +++ wp-includes/default-filters.php (.../2.3.1) (revision 6294) @@ -25,12 +25,21 @@ add_filter($filter, 'wp_filter_kses'); } -// URL +// Save URL $filters = array('pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image', - 'pre_link_rss', 'comment_url'); + 'pre_link_rss'); foreach ( $filters as $filter ) { add_filter($filter, 'strip_tags'); add_filter($filter, 'trim'); + add_filter($filter, 'sanitize_url'); + add_filter($filter, 'wp_filter_kses'); +} + +// Display URL +$filters = array('user_url', 'link_url', 'link_image', 'link_rss', 'comment_url'); +foreach ( $filters as $filter ) { + add_filter($filter, 'strip_tags'); + add_filter($filter, 'trim'); add_filter($filter, 'clean_url'); add_filter($filter, 'wp_filter_kses'); } @@ -127,6 +136,7 @@ // Actions add_action('wp_head', 'rsd_link'); +add_action('wp_head', 'wlwmanifest_link'); add_action('wp_head', 'locale_stylesheet'); add_action('publish_future_post', 'wp_publish_post', 10, 1); add_action('wp_head', 'noindex', 1); @@ -156,4 +166,4 @@ add_action('edit_post', 'wp_check_for_changed_slugs'); add_action('edit_form_advanced', 'wp_remember_old_slug'); -?> \ No newline at end of file +?> Index: wp-includes/bookmark.php =================================================================== --- wp-includes/bookmark.php (.../2.3) (revision 6294) +++ wp-includes/bookmark.php (.../2.3.1) (revision 6294) @@ -113,7 +113,7 @@ } if (!empty($category_query)) { $category_query .= ") AND taxonomy = 'link_category'"; - $join = " LEFT JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) LEFT JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id"; + $join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id"; } if (get_option('links_recently_updated_time')) { Index: wp-includes/query.php =================================================================== --- wp-includes/query.php (.../2.3) (revision 6294) +++ wp-includes/query.php (.../2.3.1) (revision 6294) @@ -932,7 +932,7 @@ } if ( !empty($q['category__in']) ) { - $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; + $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'category' "; $include_cats = "'" . implode("', '", $q['category__in']) . "'"; $whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_cats) "; @@ -948,15 +948,6 @@ } } - if ( !empty($q['category__and']) ) { - $count = 0; - foreach ( $q['category__and'] as $category_and ) { - $join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) "; - $whichcat .= " AND tt$count.term_id = '$category_and' "; - $count++; - } - } - // Category stuff for nice URLs if ( '' != $q['category_name'] ) { $reqcat = get_category_by_path($q['category_name']); @@ -982,7 +973,7 @@ $q['cat'] = $reqcat; - $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; + $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' "; $in_cats = array($q['cat']); $in_cats = array_merge($in_cats, get_term_children($q['cat'], 'category')); @@ -1024,7 +1015,7 @@ } if ( !empty($q['tag__in']) ) { - $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; + $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' "; $include_tags = "'" . implode("', '", $q['tag__in']) . "'"; $whichcat .= " AND $wpdb->term_taxonomy.term_id IN ($include_tags) "; @@ -1034,7 +1025,7 @@ } if ( !empty($q['tag_slug__in']) ) { - $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) LEFT JOIN $wpdb->terms ON ($wpdb->term_taxonomy.term_id = $wpdb->terms.term_id) "; + $join = " INNER JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) INNER JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) INNER JOIN $wpdb->terms ON ($wpdb->term_taxonomy.term_id = $wpdb->terms.term_id) "; $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' "; $include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'"; $whichcat .= " AND $wpdb->terms.slug IN ($include_tags) "; @@ -1051,28 +1042,32 @@ } } - if ( !empty($q['tag__and']) ) { - $count = 0; - foreach ( $q['tag__and'] as $tag_and ) { - $join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) "; - $whichcat .= " AND tt$count.term_id = '$tag_and' "; - $count++; + // Tag and slug intersections. + $intersections = array('category__and' => 'category', 'tag__and' => 'post_tag', 'tag_slug__and' => 'post_tag'); + foreach ($intersections as $item => $taxonomy) { + if ( empty($q[$item]) ) continue; + + if ( $item != 'category__and' ) { + $reqtag = is_term( $q[$item][0], 'post_tag' ); + if ( !empty($reqtag) ) + $q['tag_id'] = $reqtag['term_id']; } - $reqtag = is_term( $q['tag__and'][0], 'post_tag' ); - if ( !empty($reqtag) ) - $q['tag_id'] = $reqtag['term_id']; - } - if ( !empty($q['tag_slug__and']) ) { - $count = 0; - foreach ( $q['tag_slug__and'] as $tag_and ) { - $join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) LEFT JOIN $wpdb->terms AS term$count ON (tt$count.term_id = term$count.term_id) "; - $whichcat .= " AND term$count.slug = '$tag_and' "; - $count++; + $taxonomy_field = $item == 'tag_slug__and' ? 'slug' : 'term_id'; + + $q[$item] = array_unique($q[$item]); + $tsql = "SELECT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->term_relationships tr ON (p.ID = tr.object_id) INNER JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) INNER JOIN $wpdb->terms t ON (tt.term_id = t.term_id)"; + $tsql .= " WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')"; + $tsql .= " GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]); + + $post_ids = $wpdb->get_col($tsql); + + if ( count($post_ids) ) + $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") "; + else { + $whichcat = " AND 0 = 1"; + break; } - $reqtag = is_term( $q['tag_slug__and'][0], 'post_tag' ); - if ( !empty($reqtag) ) - $q['tag_id'] = $reqtag['term_id']; } // Author/user stuff Index: wp-includes/wlwmanifest.xml =================================================================== --- wp-includes/wlwmanifest.xml (.../2.3) (revision 0) +++ wp-includes/wlwmanifest.xml (.../2.3.1) (revision 6294) @@ -0,0 +1,43 @@ + + + + + + WordPress + Yes + + + + WordPress + images/wlw/wp-icon.png + images/wlw/wp-watermark.png + View site + Dashboard + + + + + + + + + + + + + + + Property changes on: wp-includes/wlwmanifest.xml ___________________________________________________________________ Name: svn:eol-style + native Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (.../2.3) (revision 6294) +++ wp-includes/formatting.php (.../2.3.1) (revision 6294) @@ -1087,7 +1087,7 @@ return apply_filters('richedit_pre', $output); } -function clean_url( $url, $protocols = null ) { +function clean_url( $url, $protocols = null, $context = 'display' ) { $original_url = $url; if ('' == $url) return $url; @@ -1103,15 +1103,22 @@ substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9-]+?\.php/i', $url) ) $url = 'http://' . $url; - $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); + // Replace ampersands ony when displaying. + if ( 'display' == $context ) + $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); + if ( !is_array($protocols) ) $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet'); if ( wp_kses_bad_protocol( $url, $protocols ) != $url ) return ''; - return apply_filters('clean_url', $url, $original_url); + return apply_filters('clean_url', $url, $original_url, $context); } +function sanitize_url( $url, $protocols = null ) { + return clean_url( $url, $protocols, 'db'); +} + // Borrowed from the PHP Manual user notes. Convert entities, while // preserving already-encoded entities: function htmlentities2($myHTML) { Index: wp-includes/taxonomy.php =================================================================== --- wp-includes/taxonomy.php (.../2.3) (revision 6294) +++ wp-includes/taxonomy.php (.../2.3.1) (revision 6294) @@ -1357,7 +1357,7 @@ } // Get the object and term ids and stick them in a lookup table - $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships LEFT JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (".join(',', array_keys($term_ids)).") AND post_type = 'post' AND post_status = 'publish'"); + $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (".join(',', array_keys($term_ids)).") AND post_type = 'post' AND post_status = 'publish'"); foreach ( $results as $row ) { $id = $term_ids[$row->term_taxonomy_id]; ++$term_items[$id][$row->object_id]; Index: wp-includes/images/wlw/WpComments.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/WpComments.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/wlw/wp-icon.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/wp-icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/wlw/WpIcon.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/WpIcon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/wlw/wp-watermark.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/wp-watermark.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/wlw/WpWatermark.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/WpWatermark.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/wlw/wp-comments.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/wlw/wp-comments.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (.../2.3) (revision 6294) +++ wp-includes/post.php (.../2.3.1) (revision 6294) @@ -102,7 +102,7 @@ $_post = null; } elseif ( is_object($post) ) { if ( 'page' == $post->post_type ) - return get_page($post, $output); + return get_page($post, $output, $filter); if ( !isset($post_cache[$blog_id][$post->ID]) ) $post_cache[$blog_id][$post->ID] = &$post; $_post = & $post_cache[$blog_id][$post->ID]; @@ -111,12 +111,12 @@ 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); + return get_page($_post, $output, $filter); else { $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1"; $_post = & $wpdb->get_row($query); if ( 'page' == $_post->post_type ) - return get_page($_post, $output); + return get_page($_post, $output, $filter); $post_cache[$blog_id][$post] = & $_post; } } @@ -972,7 +972,7 @@ // Retrieves page data given a page ID or page object. // Handles page caching. -function &get_page(&$page, $output = OBJECT) { +function &get_page(&$page, $output = OBJECT, $filter = 'raw') { global $wpdb, $blog_id; if ( empty($page) ) { @@ -985,7 +985,7 @@ } } elseif ( is_object($page) ) { if ( 'post' == $page->post_type ) - return get_post($page, $output); + return get_post($page, $output, $filter); wp_cache_add($page->ID, $page, 'pages'); $_page = $page; } else { @@ -998,12 +998,12 @@ $_page = & $GLOBALS['page']; wp_cache_add($_page->ID, $_page, 'pages'); } elseif ( isset($GLOBALS['post_cache'][$blog_id][$page]) ) { // it's actually a page, and is cached - return get_post($page, $output); + return get_post($page, $output, $filter); } else { // it's not in any caches, so off to the DB we go // Why are we using assignment for this query? $_page = & $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID= '$page' LIMIT 1"); if ( 'post' == $_page->post_type ) - return get_post($_page, $output); + return get_post($_page, $output, $filter); // 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_add($_page->ID, $_page, 'pages'); @@ -1011,6 +1011,8 @@ } } + $_page = sanitize_post($_page, $filter); + // at this point, one way or another, $_post contains the page object if ( $output == OBJECT ) { @@ -1201,7 +1203,7 @@ $pages = $wpdb->get_results($query); if ( empty($pages) ) - return array(); + return apply_filters('get_pages', array(), $r); // Update cache. update_page_cache($pages); Index: wp-includes/version.php =================================================================== --- wp-includes/version.php (.../2.3) (revision 6294) +++ wp-includes/version.php (.../2.3.1) (revision 6294) @@ -2,7 +2,7 @@ // This holds the version number in a separate file so we can bump it without cluttering the SVN -$wp_version = '2.3'; +$wp_version = '2.3.1'; $wp_db_version = 6124; ?> Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (.../2.3) (revision 6294) +++ wp-includes/general-template.php (.../2.3.1) (revision 6294) @@ -829,6 +829,11 @@ echo ' \n"; } +function wlwmanifest_link() { + echo ' '; +} + function noindex() { // If the blog is not public, tell robots to go away. if ( '0' == get_option('blog_public') ) Index: wp-includes/canonical.php =================================================================== --- wp-includes/canonical.php (.../2.3) (revision 6294) +++ wp-includes/canonical.php (.../2.3.1) (revision 6294) @@ -4,7 +4,7 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) { global $wp_rewrite, $posts, $is_IIS; - if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) ) + if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() ) return; if ( !$requested_url ) { Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (.../2.3) (revision 6294) +++ wp-includes/pluggable.php (.../2.3.1) (revision 6294) @@ -225,6 +225,7 @@ // Set the from name and email $phpmailer->From = apply_filters( 'wp_mail_from', $from_email ); + $phpmailer->Sender = apply_filters( 'wp_mail_from', $from_email ); $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name ); // Set destination address @@ -436,7 +437,7 @@ $allowed_hosts = (array) apply_filters('allowed_redirect_hosts', array($wpp['host']), $lp['host']); - if ( isset($lp['host']) && !in_array($lp['host'], $allowed_hosts) ) + if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) ) $location = get_option('siteurl') . '/wp-admin/'; wp_redirect($location, $status); Index: wp-includes/widgets.php =================================================================== --- wp-includes/widgets.php (.../2.3) (revision 6294) +++ wp-includes/widgets.php (.../2.3.1) (revision 6294) @@ -786,7 +786,7 @@ } $dims = array( 'width' => 350, 'height' => 170 ); - $class = array( 'classname' => 'widget_catgories' ); + $class = array( 'classname' => 'widget_categories' ); for ( $i = 1; $i <= 9; $i++ ) { $name = sprintf( __( 'Categories %d' ), $i ); @@ -1001,7 +1001,7 @@ $options = $newoptions = get_option('widget_rss'); if ( $_POST["rss-submit-$number"] ) { $newoptions[$number]['items'] = (int) $_POST["rss-items-$number"]; - $url = clean_url(strip_tags(stripslashes($_POST["rss-url-$number"]))); + $url = sanitize_url(strip_tags(stripslashes($_POST["rss-url-$number"]))); $newoptions[$number]['title'] = trim(strip_tags(stripslashes($_POST["rss-title-$number"]))); if ( $url !== $options[$number]['url'] ) { require_once(ABSPATH . WPINC . '/rss.php'); Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (.../2.3) (revision 6294) +++ wp-includes/functions.php (.../2.3.1) (revision 6294) @@ -726,9 +726,12 @@ } function wp($query_vars = '') { - global $wp; + global $wp, $wp_query, $wp_the_query; $wp->main($query_vars); + + if( !isset($wp_the_query) ) + $wp_the_query = $wp_query; } function get_status_header_desc( $code ) { Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (.../2.3) (revision 6294) +++ wp-includes/script-loader.php (.../2.3.1) (revision 6294) @@ -421,4 +421,24 @@ } $wp_scripts->enqueue( $handle ); } + +function wp_prototype_before_jquery( $js_array ) { + if ( false === $jquery = array_search( 'jquery', $js_array ) ) + return $js_array; + + if ( false === $prototype = array_search( 'prototype', $js_array ) ) + return $js_array; + + if ( $prototype < $jquery ) + return $js_array; + + unset($js_array[$prototype]); + + array_splice( $js_array, $jquery, 0, 'prototype' ); + + return $js_array; +} + +add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' ); + ?> Index: wp-mail.php =================================================================== --- wp-mail.php (.../2.3) (revision 6294) +++ wp-mail.php (.../2.3.1) (revision 6294) @@ -60,12 +60,15 @@ $subject = $subject[0]; } - // Set the author using the email address (To or Reply-To, the last used) + // Set the author using the email address (From or Reply-To, the last used) // otherwise use the site admin - 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) ) { - $author = $regs[1]; + if ( preg_match('/(From|Reply-To): /', $line) ) { + if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) + $author = $matches[0]; + else + $author = trim($line); + $author = sanitize_email($author); + if ( is_email($author) ) { echo "Author = {$author}

"; $author = $wpdb->escape($author); $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1"); Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (.../2.3) (revision 6294) +++ wp-admin/includes/template.php (.../2.3.1) (revision 6294) @@ -38,6 +38,7 @@ if ( current_user_can( 'manage_categories' ) ) { $edit = "".__( 'Edit' ).""; $default_cat_id = (int) get_option( 'default_category' ); + $default_link_cat_id = (int) get_option( 'default_link_category' ); if ( $category->term_id != $default_cat_id ) $edit .= "term_id ) . "' onclick=\"return deleteSomething( 'cat', $category->term_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->name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' ).""; @@ -493,7 +494,7 @@ else $current = ''; - echo "\n\t"; + echo "\n\t"; parent_dropdown( $default, $item->ID, $level +1 ); } } else { Index: wp-admin/includes/upload.php =================================================================== --- wp-admin/includes/upload.php (.../2.3) (revision 6294) +++ wp-admin/includes/upload.php (.../2.3.1) (revision 6294) @@ -31,6 +31,9 @@ $src = wp_make_link_relative( $src_base ); $src_base = str_replace($src, '', $src_base); + if ( !trim($post_title) ) + $post_title = basename($src); + $r = ''; if ( $href ) @@ -39,7 +42,9 @@ $r .= "\t\t\t$innerHTML"; if ( $href ) $r .= "\n"; - $r .= "\t\t\t\t".size_format(filesize($filesystem_path))."\n"; + $size = @filesize($filesystem_path); + if ( !empty($size) ) + $r .= "\t\t\t\t".size_format($size)."\n"; $r .= "\n\t\t

\n\t\t\t

\n"; $r .= "\t\t\t\t\n"; $r .= "\t\t\t\t\n"; Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (.../2.3) (revision 6294) +++ wp-admin/includes/upgrade.php (.../2.3.1) (revision 6294) @@ -533,6 +533,7 @@ // Convert categories to terms. $tt_ids = array(); + $have_tags = false; $categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID"); foreach ($categories as $category) { $term_id = (int) $category->cat_ID; @@ -579,6 +580,7 @@ } if ( !empty($category->tag_count) ) { + $have_tags = true; $count = (int) $category->tag_count; $taxonomy = 'post_tag'; $wpdb->query("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ('$term_id', '$taxonomy', '$description', '$parent', '$count')"); @@ -593,7 +595,11 @@ } } - $posts = $wpdb->get_results("SELECT * FROM $wpdb->post2cat"); + $select = 'post_id, category_id'; + if ( $have_tags ) + $select .= ', rel_type'; + + $posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id"); foreach ( $posts as $post ) { $post_id = (int) $post->post_id; $term_id = (int) $post->category_id; @@ -658,7 +664,7 @@ // Set default to the last category we grabbed during the upgrade loop. update_option('default_link_category', $default_link_cat); } else { - $links = $wpdb->get_results("SELECT * FROM $wpdb->link2cat"); + $links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id"); foreach ( $links as $link ) { $link_id = (int) $link->link_id; $term_id = (int) $link->category_id; @@ -1002,7 +1008,6 @@ } // Add the column list to the index create string $index_string .= ' ('.$index_columns.')'; - error_log("Index string: $index_string", 0); if(!(($aindex = array_search($index_string, $indices)) === false)) { unset($indices[$aindex]); //echo "

{$table}:
Found index:".$index_string."
\n"; Index: wp-admin/edit-post-rows.php =================================================================== --- wp-admin/edit-post-rows.php (.../2.3) (revision 6294) +++ wp-admin/edit-post-rows.php (.../2.3.1) (revision 6294) @@ -1,3 +1,4 @@ + Index: wp-admin/import/wp-cat2tag.php =================================================================== --- wp-admin/import/wp-cat2tag.php (.../2.3) (revision 6294) +++ wp-admin/import/wp-cat2tag.php (.../2.3.1) (revision 6294) @@ -63,7 +63,7 @@ print ''; - print '

'; + print '

'; print ''; } @@ -140,11 +140,23 @@ foreach ( $posts as $post ) { if ( !$wpdb->get_var("SELECT object_id FROM $wpdb->term_relationships WHERE object_id = '$post' AND term_taxonomy_id = '$id'") ) $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id) VALUES ('$post', '$id')"); + clean_post_cache($post); } } else { + $tt_ids = $wpdb->get_col("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = '{$category->term_id}' AND taxonomy = 'category'"); + if ( $tt_ids ) { + $posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id"); + foreach ( (array) $posts as $post ) + clean_post_cache($post); + } + // Change the category to a tag. $wpdb->query("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = '{$category->term_id}' AND taxonomy = 'category'"); + $terms = $wpdb->get_col("SELECT term_id FROM $wpdb->term_taxonomy WHERE parent = '{$category->term_id}' AND taxonomy = 'category'"); + foreach ( (array) $terms as $term ) + clean_category_cache($term); + // Set all parents to 0 (root-level) if their parent was the converted tag $wpdb->query("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = '{$category->term_id}' AND taxonomy = 'category'"); } @@ -160,41 +172,9 @@ print ''; } - function convert_all_confirm() { - print '
'; - - print '

' . __('Confirm') . '

'; - - print '

' . __('You are about to convert all categories to tags. Are you sure you want to continue?') . '

'; - - print '
'; - wp_nonce_field('import-cat2tag'); - print '

    

'; - print ''; - - print '
'; - } - - function convert_all() { - global $wpdb; - - $this->populate_all_categories(); - foreach ( $this->all_categories as $category ) - $this->categories_to_convert[] = $category->term_id; - $this->convert_them(); - } - function init() { - if (isset($_POST['maybe_convert_all_cats'])) { - $step = 3; - } elseif (isset($_POST['yes_convert_all_cats'])) { - $step = 4; - } elseif (isset($_POST['no_dont_do_it'])) { - die('no_dont_do_it'); - } else { - $step = (isset($_GET['step'])) ? (int) $_GET['step'] : 1; - } + $step = (isset($_GET['step'])) ? (int) $_GET['step'] : 1; $this->header(); @@ -214,14 +194,6 @@ case 2 : $this->convert_them(); break; - - case 3 : - $this->convert_all_confirm(); - break; - - case 4 : - $this->convert_all(); - break; } } Index: wp-admin/import/utw.php =================================================================== --- wp-admin/import/utw.php (.../2.3) (revision 6294) +++ wp-admin/import/utw.php (.../2.3.1) (revision 6294) @@ -157,7 +157,7 @@ // run that funky magic! $tags_added = $this->tag2post(); - echo '

' . sprintf( __('Done! %s tags where added!'), $tags_added ) . '

'; + echo '

' . sprintf( __('Done! %s tags were added!'), $tags_added ) . '

'; echo ''; wp_nonce_field('import-utw'); @@ -273,4 +273,4 @@ // add it to the import page! register_importer('utw', 'Ultimate Tag Warrior', __('Import Ultimate Tag Warrior tags into the new native tagging structure.'), array($utw_import, 'dispatch')); -?> \ No newline at end of file +?> Index: wp-admin/import/mt.php =================================================================== --- wp-admin/import/mt.php (.../2.3) (revision 6294) +++ wp-admin/import/mt.php (.../2.3.1) (revision 6294) @@ -30,7 +30,7 @@ mt-export.txt in your /wp-content/ directory'); ?>

- +

out of memory error try splitting up the import file into pieces.'); ?>

Index: wp-admin/link-import.php =================================================================== --- wp-admin/link-import.php (.../2.3) (revision 6294) +++ wp-admin/link-import.php (.../2.3.1) (revision 6294) @@ -45,10 +45,10 @@