Changeset 11159

Timestamp:

05/02/2009 09:44:09 PM (16 years ago)

Author:

ryan

Message:

Clean up save mssage. see #8713

Location:

trunk/wp-admin

Files:

• edit-form-advanced.php (modified) (1 diff)
• edit-page-form.php (modified) (1 diff)
• page.php (modified) (2 diffs)
• post.php (modified) (2 diffs)

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

@@ -17 +17 @@
 if ( isset($_GET['message']) )
     $_GET['message'] = absint( $_GET['message'] );
-$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attr( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
+$messages[1] = sprintf(__('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID));
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');

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

@@ -19 +19 @@
 if ( isset($_GET['message']) )
     $_GET['message'] = absint( $_GET['message'] );
-$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attr( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
+$messages[1] = sprintf(__('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID));
 $messages[2] = __('Custom field updated.');
 $messages[3] = __('Custom field deleted.');
-$messages[4] = sprintf(__('Page updated. <a href="%s">View page</a>'), get_permalink($post_ID));
 $messages[5] = sprintf(__('Page published. <a href="%s">View page</a>'), get_permalink($post_ID));
 $messages[6] = sprintf(__('Page submitted. <a href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) );

trunk/wp-admin/page.php

@@ -36 +36 @@
     } 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']) ) {
@@ -60 +53 @@
         $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' ) );
     }
 

trunk/wp-admin/post.php

@@ -39 +39 @@
         elseif ( isset($_POST['publish']) )
             $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/post.php') === false && strpos( $_POST['_wp_original_http_referer'], '/wp-admin/post-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( $post_ID, 'url' ) );
-        else {
-            if ( isset( $_POST['publish'] ) ) {
-                if ( 'pending' == get_post_status( $post_ID ) )
-                    $location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) );
-                else
-                    $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
-            } else {
-                $location = add_query_arg( 'message', 7, get_edit_post_link( $post_ID, 'url' ) );
-            }
+    } elseif ( ( isset($_POST['save']) || isset($_POST['publish']) ) ) {
+        if ( isset( $_POST['publish'] ) ) {
+            if ( 'pending' == get_post_status( $post_ID ) )
+                $location = add_query_arg( 'message', 8, get_edit_post_link( $post_ID, 'url' ) );
+            else
+                $location = add_query_arg( 'message', 6, get_edit_post_link( $post_ID, 'url' ) );
+        } else {
+            $location = add_query_arg( 'message', 1, get_edit_post_link( $post_ID, 'url' ) );
         }
     } elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
@@ -63 +56 @@
         $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.php') || false !== strpos($location, 'edit-post-drafts.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';