From 89c5e9720d4855b15116214123a931571dcd8886 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Sat, 1 Mar 2008 00:16:55 +0000
Subject: [PATCH] Change save page redirects. see #6024

git-svn-id: https://develop.svn.wordpress.org/trunk@7116 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/page.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/wp-admin/page.php b/wp-admin/page.php
index 7b141f3135..6c558bd73c 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -95,6 +95,7 @@ case 'editpost':
 	check_admin_referer('update-page_' . $page_ID);
 
 	$page_ID = edit_post();
+	$page = get_post($page_ID);
 
 	if ( 'post' == $_POST['originalaction'] ) {
 		if (!empty($_POST['mode'])) {
@@ -121,7 +122,11 @@ case 'editpost':
 			$referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
 		$referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
 
-		if ($_POST['addmeta']) {
+		if ( isset($_POST['save']) && ( 'draft' == $page->post_status || 'pending' == $page->post_status ) ) {
+			$location = "page.php?action=edit&post=$page_ID";
+		} elseif ( isset($_POST['save']) && (empty($referredby) || $referredby == $referer) ) {
+			$location = "page.php?action=edit&post=$page_ID";
+		} elseif ($_POST['addmeta']) {
 			$location = add_query_arg( 'message', 2, wp_get_referer() );
 			$location = explode('#', $location);
 			$location = $location[0] . '#postcustom';
@@ -135,6 +140,8 @@ case 'editpost':
 				$location = get_permalink( $page_ID );
 			if ( false !== strpos($location, 'edit-pages.php') )
 				$location = add_query_arg('posted', $page_ID, $location);
+		} elseif ( isset($_POST['publish']) ) {
+			$location = "page-new.php?posted=$page_ID";
 		} elseif ($action == 'editattachment') {
 			$location = 'attachments.php';
 		} else {