Untitled

Index: wp-content/admin-plugins/all-posts.php
===================================================================
--- wp-content/admin-plugins/all-posts.php	(revision 7975)
+++ wp-content/admin-plugins/all-posts.php	(working copy)
@@ -1,10 +1,7 @@
 <?php
 
-add_action('edit_post', 'wpmu_all_posts');
 add_action('publish_post', 'wpmu_all_posts');
-add_action('private_to_published', 'wpmu_all_posts');
-add_action('save_post', 'wpmu_all_posts');
-add_action('update_cat_id', 'move_blog_tags', 11, 2);
+//add_action('update_cat_id', 'move_blog_tags', 11, 2);
 
 add_action( 'make_spam_blog', 'unpublic_blog' );
 add_action( 'mature_blog', 'unpublic_blog' );
@@ -13,6 +10,7 @@
 
 function move_blog_tags($new_ID, $old_ID) {
 	global $wpdb;
+	// Dead code. Not called anymore.  Not updated for taxonomy.
 	$posts = (array) $wpdb->get_col( "SELECT ID FROM $wpdb->posts LEFT JOIN $wpdb->post2cat ON ( ID = post_ID ) WHERE category_ID = '$new_ID'" );
 	if ( empty($posts) )
 		return;
@@ -85,28 +83,26 @@
 	$row->guid = $guid;
 	$row->guid = str_replace('https://', 'http://', $row->guid);
 
-	if( $row->post_status == 'publish' ) {
-		$lang_id = $current_blog->lang_id;
+	if ( $row->post_status != 'publish' )
+		return;
+	
+	$lang_id = $current_blog->lang_id;
 
-		if ( $lang_id ) {
-			$wpdb->query("UPDATE `post2tag` SET lang_id = '$lang_id' WHERE blog_id = '$wpdb->blogid'");
-		}
+	if ( $lang_id ) {
+		$wpdb->query("UPDATE `post2tag` SET lang_id = '$lang_id' WHERE blog_id = '$wpdb->blogid'");
+	}
 
+	$is_public = 0;
+	$blog_public = (int) $GLOBALS['current_blog']->public;
+	if ( 1 == $blog_public )
+		$is_public = 1;
+	if ( 1 == $GLOBALS['current_blog']->mature )
 		$is_public = 0;
-		$blog_public = (int) $GLOBALS['current_blog']->public;
-		if ( 1 == $blog_public )
-			$is_public = 1;
-		if ( 1 == $GLOBALS['current_blog']->mature )
-			$is_public = 0;
 
-		$mature = $GLOBALS['current_blog']->mature;
+	$mature = $GLOBALS['current_blog']->mature;
 
-		$wpdb->query("UPDATE `post2tag` SET is_public = '$is_public' WHERE blog_id = '$wpdb->blogid'");
+	$wpdb->query("UPDATE `post2tag` SET is_public = '$is_public' WHERE blog_id = '$wpdb->blogid'");
 
-	} elseif ( $row->post_status == 'private' || $row->post_status == 'draft' ) {
-		return;
-	}
-
 	// Now for categories
 
 	$post_categories = $wpdb->get_col( "SELECT {$wpdb->term_taxonomy}.term_id FROM {$wpdb->term_taxonomy}, {$wpdb->term_relationships} WHERE {$wpdb->term_taxonomy}.term_taxonomy_id = {$wpdb->term_relationships}.term_taxonomy_id AND {$wpdb->term_relationships}.object_id = '{$post_ID}' AND {$wpdb->term_taxonomy}.taxonomy != 'link_category'" );