diff --git src/wp-admin/includes/upgrade.php src/wp-admin/includes/upgrade.php
index 9e4e19d..dd6951f 100644
|
|
|
function upgrade_all() {
|
| 552 | 552 | if ( $wp_current_db_version < 36686 ) |
| 553 | 553 | upgrade_450(); |
| 554 | 554 | |
| | 555 | if ( $wp_current_db_version < 37229 ) |
| | 556 | upgrade_460(); |
| | 557 | |
| 555 | 558 | maybe_disable_link_manager(); |
| 556 | 559 | |
| 557 | 560 | maybe_disable_automattic_widgets(); |
| … |
… |
function upgrade_450() {
|
| 1688 | 1691 | } |
| 1689 | 1692 | |
| 1690 | 1693 | /** |
| | 1694 | * Executes changes made in WordPress 4.6.0. |
| | 1695 | * |
| | 1696 | * @ignore |
| | 1697 | * @since 4.6.0 |
| | 1698 | * |
| | 1699 | * @global int $wp_current_db_version Current database version. |
| | 1700 | * @global wpdb $wpdb WordPress database abstraction object. |
| | 1701 | */ |
| | 1702 | function upgrade_460() { |
| | 1703 | delete_post_meta_by_key( '_post_restored_from' ); |
| | 1704 | } |
| | 1705 | |
| | 1706 | /** |
| 1691 | 1707 | * Executes network-level upgrade routines. |
| 1692 | 1708 | * |
| 1693 | 1709 | * @since 3.0.0 |
diff --git src/wp-includes/revision.php src/wp-includes/revision.php
index 653399e..c929e9d 100644
|
|
|
function wp_restore_post_revision( $revision_id, $fields = null ) {
|
| 378 | 378 | if ( ! $post_id || is_wp_error( $post_id ) ) |
| 379 | 379 | return $post_id; |
| 380 | 380 | |
| 381 | | // Add restore from details |
| 382 | | $restore_details = array( |
| 383 | | 'restored_revision_id' => $revision_id, |
| 384 | | 'restored_by_user' => get_current_user_id(), |
| 385 | | 'restored_time' => time() |
| 386 | | ); |
| 387 | | update_post_meta( $post_id, '_post_restored_from', $restore_details ); |
| 388 | | |
| 389 | 381 | // Update last edit user |
| 390 | 382 | update_post_meta( $post_id, '_edit_last', get_current_user_id() ); |
| 391 | 383 | |
diff --git src/wp-includes/version.php src/wp-includes/version.php
index 95fdbc2..41043d0 100644
|
|
|
$wp_version = '4.6-alpha-37183-src';
|
| 11 | 11 | * |
| 12 | 12 | * @global int $wp_db_version |
| 13 | 13 | */ |
| 14 | | $wp_db_version = 36686; |
| | 14 | $wp_db_version = 37229; |
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * Holds the TinyMCE version |