X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..67ba21ec17b4640df9bbe7701072d10ab2b05b63:/wp-admin/page.php

diff --git a/wp-admin/page.php b/wp-admin/page.php
index 3e8ae30a..68a66902 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -1,12 +1,29 @@
 <?php
+/**
+ * Edit page administration panel.
+ *
+ * Manage edit page: post, edit, delete, etc.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
 require_once('admin.php');
 
-$parent_file = 'edit.php';
+$parent_file = 'edit-pages.php';
 $submenu_file = 'edit-pages.php';
 
 wp_reset_vars(array('action'));
 
+/**
+ * Redirect to previous page.
+ *
+ * @param int $page_ID Page ID.
+ */
 function redirect_page($page_ID) {
+	global $action;
+
 	$referredby = '';
 	if ( !empty($_POST['referredby']) ) {
 		$referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
@@ -18,40 +35,36 @@ 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']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
-		if ( $_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( '_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&message=4";
-	} elseif ($_POST['addmeta']) {
+	} 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() );
 		$location = explode('#', $location);
 		$location = $location[0] . '#postcustom';
-	} elseif ($_POST['deletemeta']) {
+	} elseif ( isset($_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'];
-		$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 = "page.php?action=edit&post=$page_ID&message=4";
+		$location = add_query_arg( 'message', 1, get_edit_post_link( $page_ID, 'url' ) );
 	}
 
 	wp_redirect($location);
 }
 
-if (isset($_POST['deletepost'])) {
-$action = "delete";
-}
+if (isset($_POST['deletepost']))
+	$action = "delete";
+elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+	$action = 'preview';
 
 switch($action) {
 case 'post':
@@ -64,12 +77,12 @@ case 'post':
 	break;
 
 case 'edit':
-	$title = __('Edit');
+	$title = __('Edit Page');
 	$editing = true;
 	$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&#8217;t exist. Perhaps it was deleted?') );
 
 	if ( 'page' != $post->post_type ) {
 		wp_redirect( get_edit_post_link( $post_ID, 'url' ) );
@@ -87,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 {
@@ -96,8 +109,6 @@ case 'edit':
 		}
 	}
 
-	require_once('admin-header.php');
-
 	if ( !current_user_can('edit_page', $page_ID) )
 		die ( __('You are not allowed to edit this page.') );
 
@@ -147,13 +158,22 @@ case 'delete':
 	}
 
 	$sendback = wp_get_referer();
-	if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page.php');
+	if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('edit-pages.php?deleted=1');
 	elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-	$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+	else $sendback = add_query_arg('deleted', 1, $sendback);
 	wp_redirect($sendback);
 	exit();
 	break;
 
+case 'preview':
+	check_admin_referer( 'autosave', 'autosavenonce' );
+
+	$url = post_preview();
+
+	wp_redirect($url);
+	exit();
+	break;
+
 default:
 	wp_redirect('edit-pages.php');
 	exit();