Changeset 7527 for trunk/wp-admin/post.php

Timestamp:

03/26/2008 06:55:24 PM (17 years ago)

Author:

ryan

Message:

Redirect consistency when saving pages and posts.

File:

• trunk/wp-admin/post.php (modified) (3 diffs)

trunk/wp-admin/post.php

@@ -6 +6 @@
 
 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'] ) )
@@ -17 +61 @@
     $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;
@@ -109 +130 @@
 
     $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();