Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php (revision 23794)
+++ wp-includes/default-filters.php (working copy)
@@ -250,7 +250,9 @@
add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
add_action( 'plugins_loaded', 'wp_maybe_load_embeds', 0 );
add_action( 'shutdown', 'wp_ob_end_flush_all', 1 );
-add_action( 'pre_post_update', 'wp_save_post_revision', 10, 2 );
+add_action( 'pre_post_update', '_wp_upgrade_revisions_of_post', 11, 1 );
+add_action( 'pre_post_update', 'wp_save_post_revision', 10, 1 );
+add_action( 'post_updated', 'wp_save_post_revision', 10, 1 );
add_action( 'publish_post', '_publish_post_hook', 5, 1 );
add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php (revision 23794)
+++ wp-includes/post-template.php (working copy)
@@ -1345,11 +1345,11 @@
if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
return false;
- $author = get_the_author_meta( 'display_name', $revision->post_author );
+ $author = get_the_corrected_modified_author( $revision->ID );
/* translators: revision date format, see http://php.net/date */
$datef = _x( 'j F, Y @ G:i:s', 'revision date format');
- $gravatar = get_avatar( $revision->post_author, 24 );
+ $gravatar = get_avatar( $author['modified_author_id'], 24 );
$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
@@ -1359,7 +1359,7 @@
/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
_x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
$gravatar,
- $author,
+ $author['modified_author_display_name'],
human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
$date
);
@@ -1455,46 +1455,6 @@
}
- if ( 'form-table' == $format ) : ?>
-
-
-
-\n";
echo $rows;
@@ -1524,6 +1484,4 @@
echo "";
}
- endif;
-
}
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php (revision 23794)
+++ wp-includes/post.php (working copy)
@@ -1734,9 +1734,11 @@
* @return bool False on failure, true if success.
*/
function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
- // make sure meta is added to the post, not a revision
- if ( $the_post = wp_is_post_revision($post_id) )
- $post_id = $the_post;
+ if ( ! apply_filters( 'wp_revisions_keep_meta', true ) ) {
+ // make sure meta is added to the post, not a revision
+ if ( $the_post = wp_is_post_revision($post_id) )
+ $post_id = $the_post;
+ }
return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
}
@@ -1768,8 +1770,10 @@
*/
function get_post_custom( $post_id = 0 ) {
$post_id = absint( $post_id );
- if ( ! $post_id )
- $post_id = get_the_ID();
+ if ( ! apply_filters( 'wp_revisions_keep_meta', true ) ) {
+ if ( ! $post_id )
+ $post_id = get_the_ID();
+ }
return get_post_meta( $post_id );
}
@@ -2822,6 +2826,9 @@
$wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
}
+ if ( 'revision' !== $post_type )
+ update_post_meta( $post_ID, '_edit_last', $user_ID );
+
if ( is_object_in_taxonomy($post_type, 'category') )
wp_set_post_categories( $post_ID, $post_category );
Index: wp-includes/revision.php
===================================================================
--- wp-includes/revision.php (revision 23794)
+++ wp-includes/revision.php (working copy)
@@ -52,29 +52,128 @@
$return['post_parent'] = $post['ID'];
$return['post_status'] = 'inherit';
$return['post_type'] = 'revision';
- $return['post_name'] = $autosave ? "$post[ID]-autosave" : "$post[ID]-revision";
+ $return['post_name'] = $autosave ? "$post[ID]-1-autosave" : "$post[ID]-1-revision"; // "1" is the revisioning system version
$return['post_date'] = isset($post['post_modified']) ? $post['post_modified'] : '';
$return['post_date_gmt'] = isset($post['post_modified_gmt']) ? $post['post_modified_gmt'] : '';
+ $return['post_author'] = get_post_meta( $post['ID'], '_edit_last', true );
return $return;
}
/**
+ * Saves post meta as part of a revision.
+ *
+ * Called immedately after revision restore, with wp_restore_post_revision hook
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ *
+ * @param int $post_id The ID of the post saved as a revision.
+ * @param int $revision_id The ID of the revision.
+ * @return false error, true if success.
+ */
+function wp_restore_post_revision_meta( $post_id, $revision_id ) {
+ if ( ! apply_filters( 'wp_revisions_keep_meta', true ) )
+ return false;
+
+ //revision the post format
+ $format = get_post_meta( $revision_id, '_revisioned_post_format', true);
+ if ( '' !== $format ) {
+ set_post_format( $post_id, $format );
+ error_log('restoring ' . $format );
+ error_log('from ' . $revision_id);
+
+ }
+
+ $current_meta = get_post_meta( $revision_id );
+ if ( is_array( $current_meta ) ) {
+ foreach ( $current_meta as $meta_key => $meta_value ) {
+ update_post_meta( $post_id, $meta_key, $meta_value[0] );
+ }
+ }
+ return true;
+
+}
+
+/**
+ * Saves post meta as part of a revision.
+ *
+ * Called immedately after revision storage
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ *
+ * @param int $post_id The ID of the post saved as a revision.
+ * @param int $revision_id The ID of the revision.
+ * @return false error, true if success.
+ */
+function wp_save_post_revision_meta( $post_id, $revision_id ) {
+ // hook for 'wp_revisions_keep_meta', return false to disable revisioning for post met
+ if ( ! apply_filters( 'wp_revisions_keep_meta', true ) )
+ return false;
+
+ if ( ! wp_first_revision_matches_current_version( $post_id ) )
+ return false;
+
+ // list of post meta that should be excluded from revisioning
+ // filter 'revision_meta_do_not_copy' to allow exclusion of specific meta from revisioning
+ $exclude_meta_keys = apply_filters( 'revision_meta_do_not_copy', array(
+ '_encloseme',
+ '_pingme',
+ '_edit_last',
+ '_edit_lock',
+ '_revisioned_post_format',
+ ) );
+
+ //revision the post format
+ if ( '' !== get_post_format( $post_id ) )
+ update_post_meta( $revision_id, '_revisioned_post_format', get_post_format( $post_id ) );
+
+ error_log('storing ' . get_post_format( $post_id ) );
+ error_log('on ' . $revision_id);
+
+ $current_meta = get_post_meta( $post_id );
+
+ if ( is_array( $current_meta ) ) {
+ foreach ( $current_meta as $meta_key => $meta_value ) {
+ if ( in_array( $meta_key, $exclude_meta_keys ) )
+ continue;
+
+ update_post_meta( $revision_id, $meta_key, $meta_value[0]);
+ }
+
+ }
+ return true;
+}
+
+/**
* Saves an already existing post as a post revision.
*
- * Typically used immediately prior to post updates.
+ * Typically used immediately prior and after post updates.
+ * Prior to update checks for old revision data (latest revision != current post before update) and adds a copy of the current post as a revision if missing
+ * After update adds a copy of the current post as a revision, so latest revision always matches current post
*
* @package WordPress
* @subpackage Post_Revisions
* @since 2.6.0
*
* @uses _wp_put_post_revision()
+ * @uses wp_first_revision_matches_current_version()
*
* @param int $post_id The ID of the post to save as a revision.
* @return mixed Null or 0 if error, new revision ID, if success.
*/
-function wp_save_post_revision( $post_id, $new_data = null ) {
- // We do autosaves manually with wp_create_post_autosave()
+function wp_save_post_revision( $post_id ) {
+ //check to see if the post's first revision already matches the post data
+ //should be true before post update, _except_ for old data which
+ //doesn't include a copy of the current post data in revisions
+ if ( wp_first_revision_matches_current_version( $post_id ) )
+ return;
+
if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
return;
@@ -82,40 +181,52 @@
if ( ! WP_POST_REVISIONS )
return;
- if ( !$post = get_post( $post_id, ARRAY_A ) )
+ if ( ! $post = get_post( $post_id, ARRAY_A ) )
return;
if ( 'auto-draft' == $post['post_status'] )
return;
- if ( !post_type_supports($post['post_type'], 'revisions') )
+ if ( ! post_type_supports( $post['post_type'], 'revisions' ) )
return;
- // if new data is supplied, check that it is different from last saved revision, unless a plugin tells us to always save regardless
- if ( apply_filters( 'wp_save_post_revision_check_for_changes', true, $post, $new_data ) && is_array( $new_data ) ) {
- $post_has_changed = false;
- foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
- if ( normalize_whitespace( $new_data[ $field ] ) != normalize_whitespace( $post[ $field ] ) ) {
- $post_has_changed = true;
- break;
+ // compare the proposed update with the last stored revision, verify
+ // different, unless a plugin tells us to always save regardless
+ if ( $revisions = wp_get_post_revisions( $post_id ) ) { // grab the last revision
+ $last_revision = array_shift( $revisions );
+
+ if ( $last_revision_array = get_post( $last_revision->ID, ARRAY_A ) ) { //if no previous revisions, save one for sure
+
+ if ( apply_filters( 'wp_save_post_revision_check_for_changes', true, $last_revision_array, $post ) && is_array( $post ) ) {
+ $post_has_changed = false;
+
+ foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
+
+ if ( normalize_whitespace( $post[ $field ] ) != normalize_whitespace( $last_revision_array[ $field ] ) ) {
+ $post_has_changed = true;
+ break;
+
+ }
+ }
+
+ //don't save revision if post unchanged
+ if( ! $post_has_changed )
+ return;
}
}
- //don't save revision if post unchanged
- if( ! $post_has_changed )
- return;
}
$return = _wp_put_post_revision( $post );
// WP_POST_REVISIONS = true (default), -1
- if ( !is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
+ if ( ! is_numeric( WP_POST_REVISIONS ) || WP_POST_REVISIONS < 0 )
return $return;
// all revisions and (possibly) one autosave
$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
// WP_POST_REVISIONS = (int) (# of autosaves to save)
- $delete = count($revisions) - WP_POST_REVISIONS;
+ $delete = count( $revisions ) - WP_POST_REVISIONS;
if ( $delete < 1 )
return $return;
@@ -123,9 +234,9 @@
$revisions = array_slice( $revisions, 0, $delete );
for ( $i = 0; isset($revisions[$i]); $i++ ) {
- if ( false !== strpos( $revisions[$i]->post_name, 'autosave' ) )
+ if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
continue;
- wp_delete_post_revision( $revisions[$i]->ID );
+ wp_delete_post_revision( $revisions[ $i ]->ID );
}
return $return;
@@ -142,7 +253,7 @@
* @subpackage Post_Revisions
* @since 2.6.0
* @uses wp_get_post_revisions()
- *
+ *
* @param int $post_id The post ID.
* @param int $user_id optional The post author ID.
* @return object|bool The autosaved data or false on failure or when no autosave exists.
@@ -201,13 +312,14 @@
}
/**
- * Inserts post data into the posts table as a post revision.
+ * Inserts post data into the posts table as a post revision. Since 3.6 also stores post meta.
*
* @package WordPress
* @subpackage Post_Revisions
* @since 2.6.0
*
* @uses wp_insert_post()
+ * @uses wp_save_post_revision_meta()
*
* @param int|object|array $post Post ID, post object OR post array.
* @param bool $autosave Optional. Is the revision an autosave?
@@ -222,6 +334,8 @@
if ( !$post || empty($post['ID']) )
return;
+ $post_id = $post['ID'];
+
if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
@@ -229,6 +343,9 @@
$post = wp_slash($post); //since data is from db
$revision_id = wp_insert_post( $post );
+ if ( wp_first_revision_matches_current_version( $post_id ) )
+ wp_save_post_revision_meta($post_id, $revision_id );
+
if ( is_wp_error($revision_id) )
return $revision_id;
@@ -393,6 +510,144 @@
return $post;
}
+function _wp_get_post_revision_version( $post ) {
+ if ( is_array( $post ) ) {
+ if ( ! isset( $post['post_name'] ) ) {
+ return false;
+ }
+
+ $name = $post['post_name'];
+ } elseif ( is_object( $post ) ) {
+ if ( ! isset( $post->post_name ) ) {
+ return false;
+ }
+
+ $name = $post->post_name;
+ } else {
+ return false;
+ }
+
+ if ( ! preg_match( '/^([\d-]+)(?:autosave|revision)(?:-\d+)*$/', $name, $matches ) ) {
+ return false;
+ }
+
+ $parts = explode( '-', trim( $matches[1], '-' ) );
+
+ if ( 2 !== count( $parts ) ) {
+ return 0;
+ }
+
+ return (int) $parts[1];
+}
+
+/**
+ * Upgrade the data
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @uses get_post()
+ * @uses post_type_supports()
+ * @uses wp_get_post_revisions()
+*
+ * @param int|object $post_id Post ID or post object
+ * @return true if success, false if problems
+ */
+function _wp_upgrade_revisions_of_post( $post ) {
+ global $wpdb;
+
+ $post = get_post( $post );
+ if ( ! $post )
+ return false;
+
+ if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+ return false;
+
+ $revisions = wp_get_post_revisions( $post->ID ); // array( 'order' => 'DESC', 'orderby' => 'date' ); // Always work from most recent to oldest
+
+ if ( ! $revisions )
+ return true;
+
+ // Add post option exclusively
+ $lock = "revision-upgrade-{$post->ID}";
+ $locked_at = time();
+ $result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $locked_at ) );
+ if ( ! $result ) {
+ // If we couldn't get a lock, see how old the previous lock is
+ $locked_at = get_option( $lock );
+ if ( !$locked_at ) {
+ // Can't write to the lock, and can't read the lock.
+ // Something broken has happened
+ return false;
+ }
+
+ if ( $lock_at < time() - 3600 ) {
+ // Lock is too old - try again
+ delete_option( $lock );
+ return wp_upgrade_revisions_of_post( $post );
+ }
+
+ // Lock is not too old: some other process may be upgrading this post. Bail.
+ return;
+ } else {
+ // If we could get a lock, re-"add" the option to fire all the correct filters.
+ add_option( $lock, $locked_at );
+ }
+
+ $success = true;
+
+ reset( $revisions );
+ do {
+ $this_revision = current( $revisions );
+ $prev_revision = next( $revisions );
+
+ $this_revision_version = _wp_get_post_revision_version( $this_revision );
+
+ // Something terrible happened
+ if ( false === $this_revision_version )
+ continue;
+
+ // 1 is the latest revision version, so we're already up to date
+ if ( 0 < $this_revision_version )
+ continue;
+
+ // This revision is the oldest revision of the post.
+ // The correct post_author is probably $post->post_author, but that's only a good guess.
+ // Leave un-upgraded. Will be caught by get_modified_post_author() on display.
+ if ( ! $prev_revision ) {
+ continue;
+ }
+
+ $prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+
+ // If the previous revision is already up to date, it no longer has the information we need :(
+ if ( 0 < $prev_revision_version ) {
+ continue;
+ }
+
+ // Upgrade this revision
+
+ // Cast as object so that wp_update_post() handles slashing for us
+ $update = (object) array(
+ 'ID' => $this_revision->ID,
+ 'post_name' => preg_replace( '/^(\d+)(?:-0)?-/', '\\1-1-', $this_revision->post_name ),
+ 'post_author' => $prev_revision->post_author,
+ );
+
+ $result = wp_update_post( $update );
+ if ( ! $result || is_wp_error( $result ) ) {
+ // Wilhelm!
+ $success = false;
+ break;
+ }
+ } while ( $prev_revision );
+
+ delete_option( $lock );
+ return true;
+}
+
+
function _show_post_preview() {
if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
Index: wp-includes/author-template.php
===================================================================
--- wp-includes/author-template.php (revision 23794)
+++ wp-includes/author-template.php (working copy)
@@ -76,6 +76,80 @@
}
/**
+ * Retrieve the author who last edited the current post.
+ *
+ * As of WordPress 3.6, returns the corrected display name and ID of the user who created the revision if called on a revision object.
+ *
+ * @since 3.6
+ * @uses get_post_meta() Retrieves the ID of the author who last edited the current post.
+ * @uses get_userdata() Retrieves the author's DB object.
+ * @uses apply_filters() Calls 'the_modified_author' hook on the author display name.
+ *
+ * @param mixed $post_id Post ID, WP_Post, or falsey to use the current post.
+ * @return array modified_author_display_name => The author's display name, modified_author_id => The author's user ID; empty if problems
+ */
+function get_the_corrected_modified_author( $post_id = 0 ) {
+
+ if ( ! $post = get_post( $post_id ) )
+ return;
+
+ $unknown = false;
+
+ if ( 'revision' === $post->post_type ) {
+ // _wp_get_post_revision_version() can return false
+ $revision_version = _wp_get_post_revision_version( $post );
+ if ( false === $revision_version ) {
+ // False means something horrible happened. Just return something.
+ $modified_author_id = $post->post_author;
+ } elseif ( 0 === $revision_version ) {
+ // Set as fallback
+ $modified_author_id = $post->post_author;
+
+ $revisions = wp_get_post_revisions( $post->post_parent );
+ reset( $revisions );
+ do {
+ $this_revision = current( $revisions );
+ $prev_revision = next( $revisions ); // Ordered DESC
+
+ if ( $post->ID == $this_revision->ID && $prev_revision ) {
+ $prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+ if ( 0 === $prev_revision_version ) {
+ $modified_author_id = $prev_revision->post_author;
+ } else {
+ $unknown = true;
+ }
+ break;
+ }
+ } while ( $prev_revision );
+ } else {
+ // Everything is up to date
+ $modified_author_id = $post->post_author;
+ }
+ } else {
+ $modified_author_id = get_post_meta( $post->ID, '_edit_last', true );
+ }
+
+ if ( ! $modified_author_id )
+ return;
+
+ $modified_author = get_userdata( $modified_author_id );
+
+ $display_name = $modified_author->display_name;
+ if ( $unknown ) {
+ $display_name = sprintf( _x( '%1$s?', 'Unknown revision author name: %1$s = display_name of best guess at author' ), $display_name );
+ }
+
+ $toreturn = array (
+ 'modified_author_display_name' => apply_filters( 'the_modified_author', $display_name ),
+ 'modified_author_id' => $modified_author_id,
+ );
+
+ return $toreturn;
+}
+
+
+
+/**
* Display the name of the author who last edited the current post.
*
* @since 2.8
Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php (revision 23794)
+++ wp-admin/includes/ajax-actions.php (working copy)
@@ -2214,28 +2214,28 @@
}
if ( $compare_two_mode ) {
- $compare_to_gravatar = get_avatar( $left_revision->post_author, 24 );
- $compare_to_author = get_the_author_meta( 'display_name', $left_revision->post_author );
+ $compare_to_author = get_the_corrected_modified_author( $left_revision->ID );
+ $compare_to_gravatar = get_avatar( $compare_to_author['modified_author_id'], 24 );
$compare_to_date = date_i18n( $datef, strtotime( $left_revision->post_modified ) );
$revision_from_date_author = sprintf(
/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
_x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
$compare_to_gravatar,
- $compare_to_author,
+ $compare_to_author['modified_author_display_name'],
human_time_diff( strtotime( $left_revision->post_modified ), current_time( 'timestamp' ) ),
$compare_to_date
);
}
- $gravatar = get_avatar( $revision->post_author, 24 );
- $author = get_the_author_meta( 'display_name', $revision->post_author );
+ $author = $author = get_the_corrected_modified_author( $revision->ID );
+ $gravatar = get_avatar( $author['modified_author_id'], 24 );
$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
$revision_date_author = sprintf(
/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
_x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
$gravatar,
- $author,
+ $author['modified_author_display_name'],
human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
$date
);
@@ -2262,7 +2262,7 @@
$revision_date_author_short = sprintf(
'%s %s
%s',
$gravatar,
- $author,
+ $author['modified_author_display_name'],
$date_short
);
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php (revision 23794)
+++ wp-admin/includes/post.php (working copy)
@@ -249,8 +249,6 @@
add_meta( $post_ID );
- update_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
-
wp_update_post( $post_data );
// Now that we have an ID we can fix any attachment anchor hrefs
@@ -565,8 +563,6 @@
add_meta( $post_ID );
- add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
-
// Now that we have an ID we can fix any attachment anchor hrefs
_fix_attachment_links( $post_ID );
Index: wp-admin/js/revisions.js
===================================================================
--- wp-admin/js/revisions.js (revision 23794)
+++ wp-admin/js/revisions.js (working copy)
@@ -479,7 +479,7 @@
( REVAPP._right_diff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._right_diff ).get( 'revision_date_author_short' ) );
} else {
REVAPP.addTooltip ( $( 'a.ui-slider-handle' ),
- ( REVAPP._right_diff >= REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._right_diff ).get( 'revision_date_author_short' ) );
+ ( REVAPP._right_diff > REVAPP._revisions.length ) ? '' : REVAPP._revisions.at( REVAPP._right_diff - 1 ).get( 'revision_date_author_short' ) );
}
//
Index: wp-admin/revision.php
===================================================================
--- wp-admin/revision.php (revision 23794)
+++ wp-admin/revision.php (working copy)
@@ -21,7 +21,6 @@
if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
break;
-
if ( ! $post = get_post( $revision->post_parent ) )
break;
@@ -33,6 +32,7 @@
check_admin_referer( "restore-post_{$revision->ID}" );
+ wp_restore_post_revision_meta( $post->ID, $revision->ID );
wp_restore_post_revision( $revision->ID );
$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
break;