Wordpress 2.8

[autoinstalls/wordpress.git] / wp-admin / page.php

diff --git a/wp-admin/page.php b/wp-admin/page.php
index 91918b55969dba2e94a419d10558cbc7811db633..68a669020135b4591b2302393a2f4212f2f256eb 100644 (file)
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -35,21 +35,14 @@ function redirect_page($page_ID) {
                $location = $_POST['referredby'];
        } elseif ( 'post' == $_POST['originalaction'] && !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
                $location = 'sidebar.php?a=b';
-       } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
-               if ( isset($_POST['_wp_original_http_referer']) && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/page.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/page-new.php') === false )
-                       $location = add_query_arg( array(
-                               '_wp_original_http_referer' => urlencode( stripslashes( $_POST['_wp_original_http_referer'] ) ),
-                               'message' => 1
-                       ), get_edit_post_link( $page_ID, 'url' ) );
-               else {
-                       if ( isset( $_POST['publish'] ) ) {
-                               if ( 'pending' == get_post_status( $page_ID ) )
-                                       $location = add_query_arg( 'message', 6, get_edit_post_link( $page_ID, 'url' ) );
-                               else
-                                       $location = add_query_arg( 'message', 5, get_edit_post_link( $page_ID, 'url' ) );
-                       } else {
-                               $location = add_query_arg( 'message', 4, get_edit_post_link( $page_ID, 'url' ) );
-                       }
+       } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) ) {
+               if ( isset( $_POST['publish'] ) ) {
+                       if ( 'pending' == get_post_status( $page_ID ) )
+                               $location = add_query_arg( 'message', 6, get_edit_post_link( $page_ID, 'url' ) );
+                       else
+                               $location = add_query_arg( 'message', 5, get_edit_post_link( $page_ID, 'url' ) );
+               } else {
+                       $location = add_query_arg( 'message', 1, get_edit_post_link( $page_ID, 'url' ) );
                }
        } elseif ( isset($_POST['addmeta']) ) {
                $location = add_query_arg( 'message', 2, wp_get_referer() );
@@ -59,19 +52,10 @@ function redirect_page($page_ID) {
                $location = add_query_arg( 'message', 3, wp_get_referer() );
                $location = explode('#', $location);
                $location = $location[0] . '#postcustom';
-       } elseif (!empty($referredby) && $referredby != $referer) {
-               $location = $_POST['referredby'];
-               $location = remove_query_arg('_wp_original_http_referer', $location);
-               if ( 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 = add_query_arg( 'message', 4, get_edit_post_link( $page_ID, 'url' ) );
+               $location = add_query_arg( 'message', 1, get_edit_post_link( $page_ID, 'url' ) );
        }
 
        wp_redirect($location);
@@ -98,7 +82,7 @@ case 'edit':
        $page_ID = $post_ID = $p = (int) $_GET['post'];
        $post = get_post_to_edit($page_ID);
 
-       if ( empty($post->ID) ) wp_die( __("You attempted to edit a page that doesn't exist. Perhaps it was deleted?") );
+       if ( empty($post->ID) ) wp_die( __('You attempted to edit a page that doesn’t exist. Perhaps it was deleted?') );
 
        if ( 'page' != $post->post_type ) {
                wp_redirect( get_edit_post_link( $post_ID, 'url' ) );
@@ -116,7 +100,7 @@ case 'edit':
                if ( $last = wp_check_post_lock( $post->ID ) ) {
                        $last_user = get_userdata( $last );
                        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-                       $message = sprintf( __( 'Warning: %s is currently editing this page' ), wp_specialchars( $last_user_name ) );
+                       $message = sprintf( __( 'Warning: %s is currently editing this page' ), esc_html( $last_user_name ) );
                        $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
                        add_action('admin_notices', create_function( '', "echo '$message';" ) );
                } else {