From 1bac6fb8868cdd95e45bad71a34bff4fb6db398e Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 10 Jan 2015 05:50:22 +0000
Subject: [PATCH] In `wp-admin/includes/revision.php`, `$post->modified` is a
 coding error. It should be `$post->post_modified`.

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31123


git-svn-id: http://core.svn.wordpress.org/trunk@31104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/revision.php | 4 ++--
 wp-includes/version.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php
index ae9f93a4f7..9219f68f8d 100644
--- a/wp-admin/includes/revision.php
+++ b/wp-admin/includes/revision.php
@@ -221,8 +221,8 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 			'id'         => $post->ID,
 			'title'      => get_the_title( $post->ID ),
 			'author'     => $authors[ $post->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->modified ) ),
-			'dateShort'  => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), strtotime( $post->modified ) ),
+			'date'       => date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_modified ) ),
+			'dateShort'  => date_i18n( _x( 'j M @ G:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
 			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
 			'autosave'   => false,
 			'current'    => true,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aa910a41bd..6b6e07b5e5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31122';
+$wp_version = '4.2-alpha-31123';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.