WordPress.org

Make WordPress Core


Ignore:
Timestamp:
12/28/2013 11:52:04 PM (8 years ago)
Author:
azaozz
Message:

TinyMCE 4.0.12, first run.

  • Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
  • Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
  • Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
  • Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
  • Updates DFW, wp-admin/js/wp-fullscreen.js.

See #24067.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/ajax-actions.php

    r26868 r26876  
    17881788    $post_id = edit_post();
    17891789
    1790     if ( is_wp_error($post_id) ) {
    1791         if ( $post_id->get_error_message() )
    1792             $message = $post_id->get_error_message();
    1793         else
    1794             $message = __('Save failed');
    1795 
    1796         echo json_encode( array( 'message' => $message, 'last_edited' => '' ) );
    1797         wp_die();
    1798     } else {
    1799         $message = __('Saved.');
     1790    if ( is_wp_error( $post_id ) ) {
     1791        wp_send_json_error();
    18001792    }
    18011793
     
    18081800    }
    18091801
    1810     if ( $last_id = get_post_meta($post_id, '_edit_last', true) ) {
    1811         $last_user = get_userdata($last_id);
     1802    if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
     1803        $last_user = get_userdata( $last_id );
    18121804        $last_edited = sprintf( __('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), $last_date, $last_time );
    18131805    } else {
     
    18151807    }
    18161808
    1817     echo json_encode( array( 'message' => $message, 'last_edited' => $last_edited ) );
    1818     wp_die();
     1809    wp_send_json_success( array( 'last_edited' => $last_edited ) );
    18191810}
    18201811
     
    18401831     * @since 3.3.0
    18411832     *
    1842      * @param int $interval The interval in seconds the post lock duration should last, plus 5 seconds. Default 120.
     1833     * @param int $interval The interval in seconds the post lock duration should last, plus 5 seconds. Default 150.
    18431834     */
    1844     $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 120 ) + 5 ) . ':' . $active_lock[1];
     1835    $new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 150 ) + 5 ) . ':' . $active_lock[1];
    18451836    update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
    18461837    wp_die( 1 );
Note: See TracChangeset for help on using the changeset viewer.