diff -urN wordpress-mu-1.5.1/htaccess.dist wordpress-mu-2.6/htaccess.dist --- wordpress-mu-1.5.1/htaccess.dist 2008-04-22 17:36:51.000000000 +0200 +++ wordpress-mu-2.6/htaccess.dist 2008-05-29 13:22:02.000000000 +0200 @@ -3,6 +3,7 @@ #uploaded files RewriteRule ^(.*/)?files/$ index.php [L] +RewriteCond %{REQUEST_URI} !.*wp-content/plugins.* RewriteRule ^(.*/)?files/(.*) wp-content/blogs.php?file=$2 [L] # add a trailing slash to /wp-admin diff -urN wordpress-mu-1.5.1/index-install.php wordpress-mu-2.6/index-install.php --- wordpress-mu-1.5.1/index-install.php 2008-05-08 12:02:44.000000000 +0200 +++ wordpress-mu-2.6/index-install.php 2008-07-04 16:51:18.000000000 +0200 @@ -339,6 +339,9 @@ break; case "define('SECRET_K": case "define('SECRET_S": + case "define('LOGGED_I": + case "define('AUTH_KEY": + case "define('SECURE_A": fwrite($handle, str_replace('put your unique phrase here', md5( mt_rand() ) . md5( mt_rand() ), $line)); break; default: @@ -352,7 +355,7 @@ } function step3() { - global $wpdb, $current_site, $dirs, $wp_version; + global $wpdb, $current_site, $dirs, $wpmu_version; $base = stripslashes( dirname( $_SERVER["SCRIPT_NAME"] ) ); if( $base != "/") { $base .= "/"; @@ -440,7 +443,7 @@

Thanks for installing WordPress µ!

Donncha
- wpmu version:

+ wpmu version:



-
+
WordPress µ | Support Forums
diff -urN wordpress-mu-1.5.1/index.php wordpress-mu-2.6/index.php --- wordpress-mu-1.5.1/index.php 2006-11-24 17:16:44.000000000 +0100 +++ wordpress-mu-2.6/index.php 2008-06-13 19:21:00.000000000 +0200 @@ -1,5 +1,18 @@ diff -urN wordpress-mu-1.5.1/README.txt wordpress-mu-2.6/README.txt --- wordpress-mu-1.5.1/README.txt 2008-05-12 13:44:35.000000000 +0200 +++ wordpress-mu-2.6/README.txt 2008-05-23 17:10:51.000000000 +0200 @@ -39,7 +39,7 @@ This usually means adding a "*" hostname record pointing at your webserver in your DNS configuration tool. Matt has a more detailed explanation: -http://photomatt.net/2003/10/10/wildcard-dns-and-sub-domains/ +http://ma.tt/2003/10/10/wildcard-dns-and-sub-domains/ PHP diff -urN wordpress-mu-1.5.1/wp-activate.php wordpress-mu-2.6/wp-activate.php --- wordpress-mu-1.5.1/wp-activate.php 2007-03-28 15:25:24.000000000 +0200 +++ wordpress-mu-2.6/wp-activate.php 2008-06-13 19:21:00.000000000 +0200 @@ -1,8 +1,14 @@ cache_enabled = false; + do_action("activate_header"); get_header(); diff -urN wordpress-mu-1.5.1/wp-admin/admin-ajax.php wordpress-mu-2.6/wp-admin/admin-ajax.php --- wordpress-mu-1.5.1/wp-admin/admin-ajax.php 2008-04-24 13:45:39.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/admin-ajax.php 2008-07-09 12:00:15.000000000 +0200 @@ -1,7 +1,7 @@ get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%$s%')" ); + if ( strstr( $s, ',' ) ) { + $s = explode( ',', $s ); + $s = $s[count( $s ) - 1]; + } + $s = trim( $s ); + if ( strlen( $s ) < 2 ) + die; // require 2 chars for matching + $results = $wpdb->get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%". $s . "%')" ); echo join( $results, "\n" ); die; } @@ -25,14 +30,17 @@ case 'delete-comment' : check_ajax_referer( "delete-comment_$id" ); if ( !$comment = get_comment( $id ) ) - die('0'); + die('1'); if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) die('-1'); - if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) + if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) { + if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) ) + die('1'); $r = wp_set_comment_status( $comment->comment_ID, 'spam' ); - else + } else { $r = wp_delete_comment( $comment->comment_ID ); + } die( $r ? '1' : '0' ); break; @@ -41,24 +49,38 @@ if ( !current_user_can( 'manage_categories' ) ) die('-1'); + $cat = get_category( $id ); + if ( !$cat || is_wp_error( $cat ) ) + die('1'); + if ( wp_delete_category( $id ) ) die('1'); - else die('0'); + else + die('0'); break; case 'delete-tag' : check_ajax_referer( "delete-tag_$id" ); if ( !current_user_can( 'manage_categories' ) ) die('-1'); + $tag = get_term( $id, 'post_tag' ); + if ( !$tag || is_wp_error( $tag ) ) + die('1'); + if ( wp_delete_term($id, 'post_tag')) die('1'); - else die('0'); + else + die('0'); break; case 'delete-link-cat' : check_ajax_referer( "delete-link-category_$id" ); if ( !current_user_can( 'manage_categories' ) ) die('-1'); + $cat = get_term( $id, 'link_category' ); + if ( !$cat || is_wp_error( $cat ) ) + die('1'); + $cat_name = get_term_field('name', $id, 'link_category'); // Don't delete the default cats. @@ -89,14 +111,20 @@ if ( !current_user_can( 'manage_links' ) ) die('-1'); + $link = get_bookmark( $id ); + if ( !$link || is_wp_error( $link ) ) + die('1'); + if ( wp_delete_link( $id ) ) die('1'); - else die('0'); + else + die('0'); break; case 'delete-meta' : check_ajax_referer( "delete-meta_$id" ); if ( !$meta = get_post_meta_by_id( $id ) ) - die('0'); + die('1'); + if ( !current_user_can( 'edit_post', $meta->post_id ) ) die('-1'); if ( delete_meta( $meta->meta_id ) ) @@ -108,6 +136,9 @@ if ( !current_user_can( 'delete_post', $id ) ) die('-1'); + if ( !get_post( $id ) ) + die('1'); + if ( wp_delete_post( $id ) ) die('1'); else @@ -118,19 +149,28 @@ if ( !current_user_can( 'delete_page', $id ) ) die('-1'); + if ( !get_page( $id ) ) + die('1'); + if ( wp_delete_post( $id ) ) die('1'); - else die('0'); + else + die('0'); break; case 'dim-comment' : if ( !$comment = get_comment( $id ) ) die('0'); + if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) die('-1'); if ( !current_user_can( 'moderate_comments' ) ) die('-1'); - if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) { + $current = wp_get_comment_status( $comment->comment_ID ); + if ( $_POST['new'] == $current ) + die('1'); + + if ( 'unapproved' == $current ) { check_ajax_referer( "approve-comment_$id" ); if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) ) die('1'); @@ -150,6 +190,9 @@ $parent = 0; $post_category = isset($_POST['post_category'])? (array) $_POST['post_category'] : array(); $checked_categories = array_map( 'absint', (array) $post_category ); + $popular_ids = isset( $_POST['popular_ids'] ) ? + array_map( 'absint', explode( ',', $_POST['popular_ids'] ) ) : + false; $x = new WP_Ajax_Response(); foreach ( $names as $cat_name ) { @@ -163,7 +206,7 @@ continue; $category = get_category( $cat_id ); ob_start(); - wp_category_checklist( 0, $cat_id, $checked_categories ); + wp_category_checklist( 0, $cat_id, $checked_categories, $popular_ids ); $data = ob_get_contents(); ob_end_clean(); $x->add( array( @@ -459,10 +502,11 @@ $x->send(); break; case 'autosave' : // The name of this action is hardcoded in edit_post() - $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce'); + define( 'DOING_AUTOSAVE', true ); + + $nonce_age = check_ajax_referer( 'autosave', 'autosavenonce' ); global $current_user; - $_POST['post_status'] = 'draft'; $_POST['post_category'] = explode(",", $_POST['catslist']); $_POST['tags_input'] = explode(",", $_POST['tags_input']); if($_POST['post_type'] == 'page' || empty($_POST['post_category'])) @@ -476,8 +520,9 @@ $supplemental = array(); - $id = 0; + $id = $revision_id = 0; if($_POST['post_ID'] < 0) { + $_POST['post_status'] = 'draft'; $_POST['temp_ID'] = $_POST['post_ID']; if ( $do_autosave ) { $id = wp_write_post(); @@ -508,8 +553,18 @@ if ( !current_user_can('edit_post', $post_ID) ) die(__('You are not allowed to edit this post.')); } + if ( $do_autosave ) { - $id = edit_post(); + // Drafts are just overwritten by autosave + if ( 'draft' == $post->post_status ) { + $id = edit_post(); + } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. + $revision_id = wp_create_post_autosave( $post->ID ); + if ( is_wp_error($revision_id) ) + $id = $revision_id; + else + $id = $post->ID; + } $data = $message; } else { $id = $post->ID; diff -urN wordpress-mu-1.5.1/wp-admin/admin-header.php wordpress-mu-2.6/wp-admin/admin-header.php --- wordpress-mu-1.5.1/wp-admin/admin-header.php 2008-04-04 18:44:15.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/admin-header.php 2008-07-17 16:33:08.000000000 +0200 @@ -5,6 +5,7 @@ if ( user_can_richedit() ) wp_enqueue_script( 'wp_tiny_mce' ); } +wp_enqueue_script( 'wp-gears' ); $min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); $the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); @@ -28,14 +29,13 @@ <?php bloginfo('name') ?> › <?php echo wp_specialchars( strip_tags( $title ) ); ?> — WordPress -