WP Merge with revision 8075

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

1 files changed, 6 insertions, 5 deletions

diff --git a/wp-admin/page.php b/wp-admin/page.php
index a314e5d..7e030d1 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -74,16 +74,17 @@ case 'edit':
 
 	if ( empty($post->ID) ) wp_die( __("You attempted to edit a page that doesn't exist. Perhaps it was deleted?") );
 
-	if ( 'post' == $post->post_type ) {
-		wp_redirect("post.php?action=edit&post=$post_ID");
+	if ( 'page' != $post->post_type ) {
+		wp_redirect( get_edit_post_link( $post_ID, 'url' ) );
 		exit();
 	}
 
 	wp_enqueue_script('page');
 	if ( user_can_richedit() )
 		wp_enqueue_script('editor');
-	wp_enqueue_script('thickbox');
+	add_thickbox();
 	wp_enqueue_script('media-upload');
+	wp_enqueue_script('word-count');
 
 	if ( current_user_can('edit_page', $page_ID) ) {
 		if ( $last = wp_check_post_lock( $post->ID ) ) {
@@ -149,8 +150,8 @@ case 'delete':
 	}
 
 	$sendback = wp_get_referer();
-	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';
+	if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page.php');
+	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
 	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
 	wp_redirect($sendback);
 	exit();