Wordpress 3.5.2

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

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 3bfea5741fa3a241707b3487e493c754870b0eed..f3ba5691786751f930cfe2c227608d1b661e3104 100644 (file)
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -26,6 +26,20 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
        if ( $update )
                $post_data['ID'] = (int) $post_data['post_ID'];
 
        if ( $update )
                $post_data['ID'] = (int) $post_data['post_ID'];
 

+       $ptype = get_post_type_object( $post_data['post_type'] );
+
+       if ( $update && ! current_user_can( $ptype->cap->edit_post, $post_data['ID'] ) ) {
+               if ( 'page' == $post_data['post_type'] )
+                       return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+               else
+                       return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+       } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
+               if ( 'page' == $post_data['post_type'] )
+                       return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+               else
+                       return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+       }
+

        if ( isset( $post_data['content'] ) )
                $post_data['post_content'] = $post_data['content'];
 
        if ( isset( $post_data['content'] ) )
                $post_data['post_content'] = $post_data['content'];
 


@@ -51,23 +65,24 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
                }
        }
 
                }
        }
 

-       $ptype = get_post_type_object( $post_data['post_type'] );
-       if ( isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID']) ) {
-               if ( !current_user_can( $ptype->cap->edit_others_posts ) ) {
-                       if ( 'page' == $post_data['post_type'] ) {
-                               return new WP_Error( 'edit_others_pages', $update ?
-                                       __( 'You are not allowed to edit pages as this user.' ) :
-                                       __( 'You are not allowed to create pages as this user.' )
-                               );
-                       } else {
-                               return new WP_Error( 'edit_others_posts', $update ?
-                                       __( 'You are not allowed to edit posts as this user.' ) :
-                                       __( 'You are not allowed to post as this user.' )
-                               );
-                       }
+       if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
+                && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
+               if ( $update ) {
+                       if ( 'page' == $post_data['post_type'] )
+                               return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+                       else
+                               return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+               } else {
+                       if ( 'page' == $post_data['post_type'] )
+                               return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+                       else
+                               return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );

                }
        }
 
                }
        }
 

+       if ( ! empty( $post_data['post_status'] ) )
+               $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+

        // What to do based on which button they pressed
        if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
                $post_data['post_status'] = 'draft';
        // What to do based on which button they pressed
        if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
                $post_data['post_status'] = 'draft';


@@ -86,10 +101,12 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
                $post_id = false;
        $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
                $post_id = false;
        $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 

+       $published_statuses = array( 'publish', 'future' );
+

        // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
        // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
        // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
        // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.

-       if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->cap->publish_posts )) )
-               if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) )
+       if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
+               if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )

                        $post_data['post_status'] = 'pending';
 
        if ( ! isset($post_data['post_status']) )
                        $post_data['post_status'] = 'pending';
 
        if ( ! isset($post_data['post_status']) )


@@ -123,6 +140,10 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
                $mn = ($mn > 59 ) ? $mn -60 : $mn;
                $ss = ($ss > 59 ) ? $ss -60 : $ss;
                $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
                $mn = ($mn > 59 ) ? $mn -60 : $mn;
                $ss = ($ss > 59 ) ? $ss -60 : $ss;
                $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );

+               $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
+               if ( !$valid_date ) {
+                       return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+               }

                $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
        }
 
                $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
        }
 


@@ -158,21 +179,12 @@ function edit_post( $post_data = null ) {
                        wp_die( __('You are not allowed to edit this post.' ));
        }
 
                        wp_die( __('You are not allowed to edit this post.' ));
        }
 

-       // Autosave shouldn't save too soon after a real save
-       if ( 'autosave' == $post_data['action'] ) {
-               $post =& get_post( $post_ID );
-               $now = time();
-               $then = strtotime($post->post_date_gmt . ' +0000');
-               $delta = AUTOSAVE_INTERVAL / 2;
-               if ( ($now - $then) < $delta )
-                       return $post_ID;
-       }
-

        $post_data = _wp_translate_postdata( true, $post_data );
        if ( is_wp_error($post_data) )
                wp_die( $post_data->get_error_message() );
        $post_data = _wp_translate_postdata( true, $post_data );
        if ( is_wp_error($post_data) )
                wp_die( $post_data->get_error_message() );

-       if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
+       if ( ( empty( $post_data['action'] ) || 'autosave' != $post_data['action'] ) && 'auto-draft' == $post_data['post_status'] ) {

                $post_data['post_status'] = 'draft';
                $post_data['post_status'] = 'draft';

+       }

 
        if ( isset($post_data['visibility']) ) {
                switch ( $post_data['visibility'] ) {
 
        if ( isset($post_data['visibility']) ) {
                switch ( $post_data['visibility'] ) {


@@ -223,6 +235,21 @@ function edit_post( $post_data = null ) {
                }
        }
 
                }
        }
 

+       // Attachment stuff
+       if ( 'attachment' == $post_data['post_type'] ) {
+               if ( isset( $post_data[ '_wp_attachment_image_alt' ] ) ) {
+                       $image_alt = get_post_meta( $post_ID, '_wp_attachment_image_alt', true );
+                       if ( $image_alt != stripslashes( $post_data['_wp_attachment_image_alt'] ) ) {
+                               $image_alt = wp_strip_all_tags( stripslashes( $post_data['_wp_attachment_image_alt'] ), true );
+                               // update_meta expects slashed
+                               update_post_meta( $post_ID, '_wp_attachment_image_alt', addslashes( $image_alt ) );
+                       }
+               }
+
+               $attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+               $post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
+       }
+

        add_meta( $post_ID );
 
        update_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
        add_meta( $post_ID );
 
        update_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );


@@ -399,7 +426,7 @@ function bulk_edit_posts( $post_data = null ) {
  * @since 2.0.0
  *
  * @param string $post_type A post type string, defaults to 'post'.
  * @since 2.0.0
  *
  * @param string $post_type A post type string, defaults to 'post'.

- * @return object stdClass object containing all the default post data as attributes
+ * @return WP_Post Post object containing all the default post data as attributes

  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
        global $wpdb;
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
        global $wpdb;


@@ -439,6 +466,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
                $post->page_template = 'default';
                $post->post_parent = 0;
                $post->menu_order = 0;
                $post->page_template = 'default';
                $post->post_parent = 0;
                $post->menu_order = 0;

+               $post = new WP_Post( $post );

        }
 
        $post->post_content = apply_filters( 'default_content', $post_content, $post );
        }
 
        $post->post_content = apply_filters( 'default_content', $post_content, $post );


@@ -449,37 +477,6 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
        return $post;
 }
 
        return $post;
 }
 

-/**
- * Get the default page information to use.
- *
- * @since 2.5.0
- *
- * @return object stdClass object containing all the default post data as attributes
- */
-function get_default_page_to_edit() {
-       $page = get_default_post_to_edit();
-       $page->post_type = 'page';
-       return $page;
-}
-
-/**
- * Get an existing post and format it for editing.
- *
- * @since 2.0.0
- *
- * @param unknown_type $id
- * @return unknown
- */
-function get_post_to_edit( $id ) {
-
-       $post = get_post( $id, OBJECT, 'edit' );
-
-       if ( $post->post_type == 'page' )
-               $post->page_template = get_post_meta( $id, '_wp_page_template', true );
-
-       return $post;
-}
-

 /**
  * Determine if a post exists based on title, content, and date
  *
 /**
  * Determine if a post exists based on title, content, and date
  *


@@ -516,7 +513,7 @@ function post_exists($title, $content = '', $date = '') {
        }
 
        if ( !empty ( $args ) )
        }
 
        if ( !empty ( $args ) )

-               return $wpdb->get_var( $wpdb->prepare($query, $args) );
+               return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );

 
        return 0;
 }
 
        return 0;
 }


@@ -745,7 +742,7 @@ function update_meta( $meta_id, $meta_key, $meta_value ) {
  * @return unknown
  */
 function _fix_attachment_links( $post_ID ) {
  * @return unknown
  */
 function _fix_attachment_links( $post_ID ) {

-       $post = & get_post( $post_ID, ARRAY_A );
+       $post = get_post( $post_ID, ARRAY_A );

        $content = $post['post_content'];
 
        // quick sanity check, don't run if no pretty permalinks or post is not published
        $content = $post['post_content'];
 
        // quick sanity check, don't run if no pretty permalinks or post is not published


@@ -892,23 +889,6 @@ function wp_edit_posts_query( $q = false ) {
        return $avail_post_stati;
 }
 
        return $avail_post_stati;
 }
 

-/**
- * Get default post mime types
- *
- * @since 2.9.0
- *
- * @return array
- */
-function get_post_mime_types() {
-       $post_mime_types = array(       //      array( adj, noun )
-               'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
-               'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
-               'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
-       );
-
-       return apply_filters('post_mime_types', $post_mime_types);
-}
-

 /**
  * {@internal Missing Short Description}}
  *
 /**
  * {@internal Missing Short Description}}
  *


@@ -925,12 +905,14 @@ function get_available_post_mime_types($type = 'attachment') {
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Executes a query for attachments. An array of WP_Query arguments
+ * can be passed in, which will override the arguments set by this function.

  *
  * @since 2.5.0
  *
  * @since 2.5.0

+ * @uses apply_filters() Calls 'upload_per_page' on posts_per_page argument

  *
  *

- * @param unknown_type $q
- * @return unknown
+ * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
+ * @return array

  */
 function wp_edit_attachments_query( $q = false ) {
        if ( false === $q )
  */
 function wp_edit_attachments_query( $q = false ) {
        if ( false === $q )


@@ -1010,7 +992,7 @@ function postbox_classes( $id, $page ) {
  * @return array With two entries of type string
  */
 function get_sample_permalink($id, $title = null, $name = null) {
  * @return array With two entries of type string
  */
 function get_sample_permalink($id, $title = null, $name = null) {

-       $post = &get_post($id);
+       $post = get_post($id);

        if ( !$post->ID )
                return array('', '');
 
        if ( !$post->ID )
                return array('', '');
 


@@ -1063,24 +1045,22 @@ function get_sample_permalink($id, $title = null, $name = null) {
 }
 
 /**
 }
 
 /**

- * sample permalink html
- *
- * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
+ * Returns the HTML of the sample permalink slug editor.

  *
  * @since 2.5.0
  *
  * @param int|object $id Post ID or post object.
  *
  * @since 2.5.0
  *
  * @param int|object $id Post ID or post object.

- * @param string $new_title (optional) New title
- * @param string $new_slug (optional) New slug
- * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
+ * @param string $new_title Optional. New title.
+ * @param string $new_slug Optional. New slug.
+ * @return string The HTML of the sample permalink slug editor.

  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
        global $wpdb;
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
        global $wpdb;

-       $post = &get_post($id);
+       $post = get_post($id);

 
        list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
 
        list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 

-       if ( 'publish' == $post->post_status ) {
+       if ( 'publish' == get_post_status( $post ) ) {

                $ptype = get_post_type_object($post->post_type);
                $view_post = $ptype->labels->view_item;
                $title = __('Click to edit this part of the permalink');
                $ptype = get_post_type_object($post->post_type);
                $view_post = $ptype->labels->view_item;
                $title = __('Click to edit this part of the permalink');


@@ -1089,11 +1069,11 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
        }
 
        if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
        }
 
        if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {

-               $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
+               $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";

                if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
                if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )

-                       $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
-               if ( isset($view_post) )
-                       $return .= "<span id='view-post-btn'><a href='$permalink' class='button' target='_blank'>$view_post</a></span>\n";
+                       $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+               if ( isset( $view_post ) )
+                       $return .= "<span id='view-post-btn'><a href='$permalink' class='button button-small'>$view_post</a></span>\n";

 
                $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
 
                $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 


@@ -1118,12 +1098,12 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
        $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
        $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
        $return =  '<strong>' . __('Permalink:') . "</strong>\n";
        $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
        $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
        $return =  '<strong>' . __('Permalink:') . "</strong>\n";

-       $return .= '<span id="sample-permalink">' . $display_link . "</span>\n";
+       $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";

        $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
        $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.

-       $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
+       $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";

        $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
        if ( isset($view_post) )
        $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
        if ( isset($view_post) )

-               $return .= "<span id='view-post-btn'><a href='$view_link' class='button' target='_blank'>$view_post</a></span>\n";
+               $return .= "<span id='view-post-btn'><a href='$view_link' class='button button-small'>$view_post</a></span>\n";

 
        $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
 
        $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 


@@ -1136,16 +1116,15 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
  * @since 2.9.0
  *
  * @param int $thumbnail_id ID of the attachment used for thumbnail
  * @since 2.9.0
  *
  * @param int $thumbnail_id ID of the attachment used for thumbnail

- * @param int $post_id ID of the post associated with the thumbnail, defaults to global $post_ID
+ * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.

  * @return string html
  */
  * @return string html
  */

-function _wp_post_thumbnail_html( $thumbnail_id = null, $post_id = null ) {
-       global $content_width, $_wp_additional_image_sizes, $post_ID;
+function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+       global $content_width, $_wp_additional_image_sizes;

 
 

-       if ( empty( $post_id ) )
-               $post_id = $post_ID;
+       $post = get_post( $post );

 
 

-       $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post_id) );
+       $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) );

        $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) );
 
        $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) );
 


@@ -1157,14 +1136,14 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post_id = null ) {
                else
                        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
                if ( !empty( $thumbnail_html ) ) {
                else
                        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
                if ( !empty( $thumbnail_html ) ) {

-                       $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$post_id" );
+                       $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );

                        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html );
                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';
                }
                $content_width = $old_content_width;
        }
 
                        $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html );
                        $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';
                }
                $content_width = $old_content_width;
        }
 

-       return apply_filters( 'admin_post_thumbnail_html', $content );
+       return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID );

 }
 
 /**
 }
 
 /**


@@ -1222,8 +1201,7 @@ function wp_set_post_lock( $post_id ) {
  * @return none
  */
 function _admin_notice_post_locked() {
  * @return none
  */
 function _admin_notice_post_locked() {

-       global $post;
-
+       $post = get_post();

        $lock = explode( ':', get_post_meta( $post->ID, '_edit_lock', true ) );
        $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
        $last_user = get_userdata( $user );
        $lock = explode( ':', get_post_meta( $post->ID, '_edit_lock', true ) );
        $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
        $last_user = get_userdata( $user );