Changeset 7438

Timestamp:

03/21/08 03:31:12 (9 years ago)

Author:

markjaquith

Message:

"Go back" link for admin-initiated post/page edits. e.g. do a search, edit a post, click the link to go back to the search.

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/edit-page-form.php (modified) (2 diffs)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -2 +2 @@
 $action = isset($action)? $action : '';
 if ( isset($_GET['message']) )
-    $_GET['message'] = (int) $_GET['message'];
-$messages[1] = __('Post updated');
-$messages[2] = __('Custom field updated');
+    $_GET['message'] = absint( $_GET['message'] );
+$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+$messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
 ?>
 <?php if (isset($_GET['message'])) : ?>
-<div id="message" class="updated fade"><p><?php echo wp_specialchars($messages[$_GET['message']]); ?></p></div>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
 
@@ -60 +60 @@
 if ( !empty($_REQUEST['popupurl']) )
     echo clean_url(stripslashes($_REQUEST['popupurl']));
-else if ( url_to_postid(wp_get_referer()) == $post_ID )
+else if ( url_to_postid(wp_get_referer()) == $post_ID && strpos( wp_get_referer(), '/wp-admin/' ) === false )
     echo 'redo';
 else
     echo clean_url(stripslashes(wp_get_referer()));
 ?>" />
+<?php wp_original_referer_field(true, 'previous'); ?>
 
 <?php echo $form_extra ?>

trunk/wp-admin/edit-page-form.php

@@ -1 +1 @@
 <?php
+if ( isset($_GET['message']) )
+    $_GET['message'] = absint( $_GET['message'] );
+$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) );
+?>
+<?php if (isset($_GET['message'])) : ?>
+<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php endif;
 
 if (!isset($post_ID) || 0 == $post_ID) {
@@ -39 +46 @@
 <input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php
-if ( url_to_postid(wp_get_referer()) == $post_ID )
+if ( url_to_postid(wp_get_referer()) == $post_ID && strpos( wp_get_referer(), '/wp-admin/' ) === false )
     echo 'redo';
 else
     echo clean_url(stripslashes(wp_get_referer()));
 ?>" />
+<?php wp_original_referer_field(true, 'previous'); ?>
 
 <div id="poststuff">

trunk/wp-admin/page.php

@@ -124 +124 @@
 
         if ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
-            $location = "page.php?action=edit&post=$page_ID";
+            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() );

trunk/wp-admin/post.php

@@ -137 +137 @@
 
         if ( isset($_POST['save']) && ( empty($referredby) || $referredby == $referer || 'redo' != $referredby ) ) {
-            $location = "post.php?action=edit&post=$post_ID";
+            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() );

trunk/wp-includes/functions.php

@@ -982 +982 @@
     
     if ( $referer )
-        wp_referer_field( $echo );
+        wp_referer_field( $echo, 'previous' );
     
     return $nonce_field;
@@ -988 +988 @@
 
 
-function wp_referer_field( $echo = true ) {
+function wp_referer_field( $echo = true) {
     $ref = attribute_escape( $_SERVER['REQUEST_URI'] );
     $referer_field = '<input type="hidden" name="_wp_http_referer" value="'. $ref . '" />';
-    
-    if ( wp_get_original_referer() ) {
-        $original_ref = attribute_escape( stripslashes( wp_get_original_referer() ) );
-        $referer_field .= "\n".'<input type="hidden" name="_wp_original_http_referer" value="'. $original_ref . '" />';
-    }
 
     if ( $echo )
         echo $referer_field;
-    
     return $referer_field;
 }
 
-
-function wp_original_referer_field( $echo = true ) {
-    $orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . attribute_escape( stripslashes( $_SERVER['REQUEST_URI'] ) ) . '" />';
+function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
+    $jump_back_to = ( 'previous' == $jump_back_to ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+    $ref = ( wp_get_original_referer() ) ? wp_get_original_referer() : $jump_back_to;
+    $orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . attribute_escape( stripslashes( $ref ) ) . '" />';
     if ( $echo )
         echo $orig_referer_field;
-    
     return $orig_referer_field;
 }
@@ -1015 +1009 @@
 function wp_get_referer() {
     if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
-        return $_REQUEST['_wp_http_referer'];
+        $ref = $_REQUEST['_wp_http_referer'];
     else if ( ! empty( $_SERVER['HTTP_REFERER'] ) )
-        return $_SERVER['HTTP_REFERER'];
+        $ref = $_SERVER['HTTP_REFERER'];
+
+    if ( $ref !== $_SERVER['REQUEST_URI'] )
+        return $ref;
     return false;
 }