Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / includes / misc.php

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index f09ef4528909908670ba644c3867afd7d7e9ee8c..5b609e45ba1f39dbedd82a37ae3a83ac545448f1 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -220,11 +220,10 @@ add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
  * @return string
  */
 function url_shorten( $url ) {
-       $short_url = str_replace( 'http://', '', stripslashes( $url ));
-       $short_url = str_replace( 'www.', '', $short_url );
+       $short_url = str_replace( array( 'http://', 'www.' ), '', $url );
        $short_url = untrailingslashit( $short_url );
        if ( strlen( $short_url ) > 35 )
-               $short_url = substr( $short_url, 0, 32 ) . '...';
+               $short_url = substr( $short_url, 0, 32 ) . '…';
        return $short_url;
 }
 
@@ -371,7 +370,7 @@ function set_screen_options() {
 }
 
 /**
- * Check if rewrite rule for WordPress already exists in the IIS 7 configuration file
+ * Check if rewrite rule for WordPress already exists in the IIS 7+ configuration file
  *
  * @since 2.8.0
  *
@@ -429,7 +428,7 @@ function iis7_delete_rewrite_rule($filename) {
 }
 
 /**
- * Add WordPress rewrite rule to the IIS 7 configuration file.
+ * Add WordPress rewrite rule to the IIS 7+ configuration file.
  *
  * @since 2.8.0
  *
@@ -561,3 +560,108 @@ function _ipad_meta() {
        }
 }
 add_action('admin_head', '_ipad_meta');
+
+/**
+ * Check lock status for posts displayed on the Posts screen
+ *
+ * @since 3.6
+ */
+function wp_check_locked_posts( $response, $data, $screen_id ) {
+       $checked = array();
+
+       if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+               foreach ( $data['wp-check-locked-posts'] as $key ) {
+                       if ( ! $post_id = absint( substr( $key, 5 ) ) )
+                               continue;
+
+                       if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
+                               $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
+
+                               if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+                                       $send['avatar_src'] = $matches[1];
+
+                               $checked[$key] = $send;
+                       }
+               }
+       }
+
+       if ( ! empty( $checked ) )
+               $response['wp-check-locked-posts'] = $checked;
+
+       return $response;
+}
+add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
+
+/**
+ * Check lock status on the New/Edit Post screen and refresh the lock
+ *
+ * @since 3.6
+ */
+function wp_refresh_post_lock( $response, $data, $screen_id ) {
+       if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+               $received = $data['wp-refresh-post-lock'];
+               $send = array();
+
+               if ( ! $post_id = absint( $received['post_id'] ) )
+                       return $response;
+
+               if ( ! current_user_can('edit_post', $post_id) )
+                       return $response;
+
+               if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
+                       $error = array(
+                               'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
+                       );
+
+                       if ( $avatar = get_avatar( $user->ID, 64 ) ) {
+                               if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+                                       $error['avatar_src'] = $matches[1];
+                       }
+
+                       $send['lock_error'] = $error;
+               } else {
+                       if ( $new_lock = wp_set_post_lock( $post_id ) )
+                               $send['new_lock'] = implode( ':', $new_lock );
+               }
+
+               $response['wp-refresh-post-lock'] = $send;
+       }
+
+       return $response;
+}
+add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
+
+/**
+ * Check nonce expiration on the New/Edit Post screen and refresh if needed
+ *
+ * @since 3.6
+ */
+function wp_refresh_post_nonces( $response, $data, $screen_id ) {
+       if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+               $received = $data['wp-refresh-post-nonces'];
+               $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
+
+               if ( ! $post_id = absint( $received['post_id'] ) )
+                       return $response;
+
+               if ( ! current_user_can( 'edit_post', $post_id ) || empty( $received['post_nonce'] ) )
+                       return $response;
+
+               if ( 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
+                       $response['wp-refresh-post-nonces'] = array(
+                               'replace' => array(
+                                       'autosavenonce' => wp_create_nonce('autosave'),
+                                       'getpermalinknonce' => wp_create_nonce('getpermalink'),
+                                       'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+                                       'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+                                       '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
+                                       '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+                               ),
+                               'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
+                       );
+               }
+       }
+
+       return $response;
+}
+add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 );