From 1c0b403516b6c4c8f7942a2acaf33fdcdf51e597 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 26 Mar 2008 18:55:24 +0000 Subject: [PATCH] Redirect consistency when saving pages and posts. git-svn-id: http://svn.automattic.com/wordpress/trunk@7527 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 1 + wp-admin/edit-page-form.php | 3 + wp-admin/page.php | 118 +++++++++++------------------- wp-admin/post.php | 125 ++++++++++++-------------------- 4 files changed, 94 insertions(+), 153 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index f0d14eaea1..0522933c48 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -5,6 +5,7 @@ if ( isset($_GET['message']) ) $messages[1] = sprintf( __( 'Post updated. Continue editing below or go back.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); +$messages[4] = __('Post updated.'); ?>

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 8312f161e4..4c80ee5bdc 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -2,6 +2,9 @@ if ( isset($_GET['message']) ) $_GET['message'] = absint( $_GET['message'] ); $messages[1] = sprintf( __( 'Page updated. Continue editing below or go back.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); +$messages[2] = __('Custom field updated.'); +$messages[3] = __('Custom field deleted.'); +$messages[4] = __('Page updated.'); ?>

diff --git a/wp-admin/page.php b/wp-admin/page.php index 2154e34680..1113063317 100644 --- a/wp-admin/page.php +++ b/wp-admin/page.php @@ -6,6 +6,48 @@ $submenu_file = 'edit-pages.php'; wp_reset_vars(array('action')); +function redirect_page($page_ID) { + $referredby = ''; + if ( !empty($_POST['referredby']) ) + $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']); + $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer()); + + if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) { + $location = $_POST['referredby']; + } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) { + $location = 'sidebar.php?a=b'; + } elseif ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) { + if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false ) + $location = add_query_arg( '_wp_original_http_referer', urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ), "page.php?action=edit&post=$page_ID&message=1" ); + else + $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'; + } elseif ($_POST['deletemeta']) { + $location = add_query_arg( 'message', 3, wp_get_referer() ); + $location = explode('#', $location); + $location = $location[0] . '#postcustom'; + } elseif (!empty($referredby) && $referredby != $referer) { + $location = $_POST['referredby']; + if ( $_POST['referredby'] == 'redo' ) + $location = get_permalink( $page_ID ); + elseif ( false !== strpos($location, 'edit-pages.php') ) + $location = add_query_arg('posted', $page_ID, $location); + elseif ( false !== strpos($location, 'wp-admin') ) + $location = "page-new.php?posted=$page_ID"; + } elseif ( isset($_POST['publish']) ) { + $location = "page-new.php?posted=$page_ID"; + } elseif ($action == 'editattachment') { + $location = 'attachments.php'; + } else { + $location = "page.php?action=edit&post=$page_ID&message=4"; + } + + wp_redirect($location); +} + if (isset($_POST['deletepost'])) { $action = "delete"; } @@ -15,27 +57,8 @@ case 'post': check_admin_referer('add-page'); $page_ID = write_post(); - // Redirect. - if (!empty($_POST['mode'])) { - switch($_POST['mode']) { - case 'bookmarklet': - $location = $_POST['referredby']; - break; - case 'sidebar': - $location = 'sidebar.php?a=b'; - break; - default: - $location = 'page-new.php'; - break; - } - } else { - $location = "page-new.php?posted=$page_ID"; - } + redirect_page($page_ID); - if ( isset($_POST['save']) ) - $location = "page.php?action=edit&post=$page_ID"; - - wp_redirect($location); exit(); break; @@ -95,61 +118,8 @@ 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'])) { - switch($_POST['mode']) { - case 'bookmarklet': - $location = $_POST['referredby']; - break; - case 'sidebar': - $location = 'sidebar.php?a=b'; - break; - default: - $location = 'page-new.php'; - break; - } - } else { - $location = "page-new.php?posted=$page_ID"; - } - - if ( isset($_POST['save']) ) - $location = "page.php?action=edit&post=$page_ID"; - } else { - $referredby = ''; - if ( !empty($_POST['referredby']) ) - $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']); - $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer()); - - if ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) { - if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false ) - $location = add_query_arg( '_wp_original_http_referer', urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ), "page.php?action=edit&post=$page_ID&message=1" ); - else - $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'; - } elseif ($_POST['deletemeta']) { - $location = add_query_arg( 'message', 3, wp_get_referer() ); - $location = explode('#', $location); - $location = $location[0] . '#postcustom'; - } elseif (!empty($referredby) && $referredby != $referer) { - $location = $_POST['referredby']; - if ( $_POST['referredby'] == 'redo' ) - $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 { - $location = 'page-new.php'; - } - } - wp_redirect($location); // Send user on their way while we keep working + redirect_page($page_ID); exit(); break; diff --git a/wp-admin/post.php b/wp-admin/post.php index 0e5d6062a3..4da29c65de 100644 --- a/wp-admin/post.php +++ b/wp-admin/post.php @@ -6,6 +6,50 @@ $submenu_file = 'edit.php'; wp_reset_vars(array('action', 'safe_mode', 'withcomments', 'posts', 'content', 'edited_post_title', 'comment_error', 'profile', 'trackback_url', 'excerpt', 'showcomments', 'commentstart', 'commentend', 'commentorder')); +function redirect_post($post_ID = '') { + global $action; + + $referredby = ''; + if ( !empty($_POST['referredby']) ) + $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']); + $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer()); + + if ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'bookmarklet' == $_POST['mode'] ) { + $location = $_POST['referredby']; + } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) { + $location = 'sidebar.php?a=b'; + } elseif ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) { + if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false ) + $location = add_query_arg( '_wp_original_http_referer', urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ), "post.php?action=edit&post=$post_ID&message=1" ); + else + $location = "post.php?action=edit&post=$post_ID&message=4"; + } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) { + $location = add_query_arg( 'message', 2, wp_get_referer() ); + $location = explode('#', $location); + $location = $location[0] . '#postcustom'; + } elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) { + $location = add_query_arg( 'message', 3, wp_get_referer() ); + $location = explode('#', $location); + $location = $location[0] . '#postcustom'; + } elseif (!empty($referredby) && $referredby != $referer) { + $location = $_POST['referredby']; + if ( $_POST['referredby'] == 'redo' ) + $location = get_permalink( $post_ID ); + elseif ( false !== strpos($location, 'edit.php') ) + $location = add_query_arg('posted', $post_ID, $location); + elseif ( false !== strpos($location, 'wp-admin') ) + $location = "post-new.php?posted=$post_ID"; + } elseif ( isset($_POST['publish']) ) { + $location = "post-new.php?posted=$post_ID"; + } elseif ($action == 'editattachment') { + $location = 'attachments.php'; + } else { + $location = "post.php?action=edit&post=$post_ID&message=4"; + } + + wp_redirect( $location ); +} + if ( isset( $_POST['deletepost'] ) ) $action = 'delete'; @@ -16,30 +60,7 @@ case 'post': $post_ID = 'post' == $action ? write_post() : edit_post(); - // Redirect. - if ( !empty( $_POST['mode'] ) ) { - switch($_POST['mode']) { - case 'bookmarklet': - $location = $_POST['referredby']; - break; - case 'sidebar': - $location = 'sidebar.php?a=b'; - break; - default: - $location = 'post-new.php'; - break; - } - } else { - $location = "post-new.php?posted=$post_ID"; - } - - if ( isset( $_POST['save'] ) ) - $location = "post.php?action=edit&post=$post_ID"; - - if ( empty( $post_ID ) ) - $location = 'post-new.php'; - - wp_redirect( $location ); + redirect_post($post_ID); exit(); break; @@ -108,62 +129,8 @@ case 'editpost': check_admin_referer('update-post_' . $post_ID); $post_ID = edit_post(); - $post = get_post($post_ID); - if ( 'post' == $_POST['originalaction'] ) { - if (!empty($_POST['mode'])) { - switch($_POST['mode']) { - case 'bookmarklet': - $location = $_POST['referredby']; - break; - case 'sidebar': - $location = 'sidebar.php?a=b'; - break; - default: - $location = 'post-new.php'; - break; - } - } else { - $location = "post-new.php?posted=$post_ID"; - } - - if ( isset($_POST['save']) ) - $location = "post.php?action=edit&post=$post_ID"; - } else { - $referredby = ''; - if ( !empty($_POST['referredby']) ) - $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']); - $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer()); - - if ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) { - if ( $_POST['_wp_original_http_referer'] && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post.php') === false ) - $location = add_query_arg( '_wp_original_http_referer', urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ), "post.php?action=edit&post=$post_ID&message=1" ); - else - $location = "post.php?action=edit&post=$post_ID"; - } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) { - $location = add_query_arg( 'message', 2, wp_get_referer() ); - $location = explode('#', $location); - $location = $location[0] . '#postcustom'; - } elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) { - $location = add_query_arg( 'message', 3, wp_get_referer() ); - $location = explode('#', $location); - $location = $location[0] . '#postcustom'; - } elseif (!empty($referredby) && $referredby != $referer) { - $location = $_POST['referredby']; - if ( $_POST['referredby'] == 'redo' ) - $location = get_permalink( $post_ID ); - if (false !== strpos($location, 'edit.php') ) - $location = add_query_arg('posted', $post_ID, $location); - } elseif ( isset($_POST['publish']) ) { - $location = "post-new.php?posted=$post_ID"; - } elseif ($action == 'editattachment') { - $location = 'attachments.php'; - } else { - $location = "post.php?action=edit&post=$post_ID"; - } - } - - wp_redirect($location); // Send user on their way while we keep working + redirect_post($post_ID); // Send user on their way while we keep working exit(); break;