WP Merge to 4780

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@854 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 14 insertions, 4 deletions

diff --git a/wp-admin/page.php b/wp-admin/page.php
index acffa30..4cad302 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -45,10 +45,12 @@ case 'edit':
 	$editing = true;
 	$page_ID = $post_ID = $p = (int) $_GET['post'];
 	$post = get_post_to_edit($page_ID);
-	if( $post->post_type == 'post' ) {
-		header( "Location: " . str_replace( "page.php", "post.php", $_SERVER[ 'REQUEST_URI' ] ) );
-		die();
+
+	if ( 'post' == $post->post_type ) {
+		wp_redirect("post.php?action=edit&post=$post_ID");
+		exit();
 	}
+
 	if($post->post_status == 'draft') {
 		wp_enqueue_script('prototype');
 		wp_enqueue_script('autosave');
diff --git a/wp-admin/post.php b/wp-admin/post.php
index dd756fb..8f0cc53 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -47,6 +47,12 @@ case 'edit':
 	$editing = true;
 	$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");
+		exit();
+	}
+
 	if($post->post_status == 'draft') {
 		wp_enqueue_script('prototype');
 		wp_enqueue_script('autosave');
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 001a07e..e0c347c 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -174,7 +174,7 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 3308 )
 		upgrade_160();
 
-	if ( $wp_current_db_version < 3845 )
+	if ( $wp_current_db_version < 4772 )
 		upgrade_210();
 
 	if ( $wp_current_db_version < 4351 )
@@ -561,7 +561,9 @@ function upgrade_210() {
 				$wpdb->query("UPDATE $wpdb->categories SET link_count = '$count' WHERE cat_ID = '$cat_id'");
 			}
 		}
+	}
 
+	if ( $wp_current_db_version < 4772 ) {
 		// Obsolete linkcategories table
 		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
 	}