Changeset 19272

Timestamp:

11/14/2011 04:59:45 PM (14 years ago)

Author:

ryan

Message:

Fix edit.php row action redirects when referrers are not sent. Return false from wp_get_referer() when no referrer found. Props mitchoyoshitaka. fixes #17628

Location:

trunk

Files:

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

trunk/wp-admin/edit.php

@@ -52 +52 @@
 
     $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
+    if ( ! $sendback )
+        $sendback = admin_url( $parent_file );
     $sendback = add_query_arg( 'paged', $pagenum, $sendback );
     if ( strpos($sendback, 'post.php') !== false )

trunk/wp-admin/post.php

@@ -83 +83 @@
 
 $sendback = wp_get_referer();
-if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false ) {
-    $sendback = admin_url('edit.php');
-    $sendback .= ( !empty( $post_type ) ) ? '?post_type=' . $post_type : '';
+if ( ! $sendback ||
+     strpos( $sendback, 'post.php' ) !== false ||
+     strpos( $sendback, 'post-new.php' ) !== false ) {
+    $sendback = admin_url( 'edit.php' );
+    $sendback .= ( ! empty( $post_type ) ) ? '?post_type=' . $post_type : '';
 } else {
     $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );

trunk/wp-includes/functions.php

@@ -2038 +2038 @@
 
 /**
- * Retrieve referer from '_wp_http_referer', HTTP referer, or current page respectively.
+ * Retrieve referer from '_wp_http_referer' or HTTP referer. If it's the same
+ * as the current request URL, will return false.
  *
  * @package WordPress
@@ -2047 +2048 @@
  */
 function wp_get_referer() {
-    $ref = '';
+    $ref = false;
     if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
         $ref = $_REQUEST['_wp_http_referer'];
@@ -2053 +2054 @@
         $ref = $_SERVER['HTTP_REFERER'];
 
-    if ( $ref !== $_SERVER['REQUEST_URI'] )
+    if ( $ref && $ref !== $_SERVER['REQUEST_URI'] )
         return $ref;
     return false;