WordPress 4.0

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

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 9f7f469a427bc6ee48d6ad5088f94368f1b23a8c..3e2c9de6b9c9a0816e5dbb56f4b5abf9b4e85121 100644 (file)
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -42,14 +42,17 @@ if ( 'publish' == $post->post_status ) {
        $preview_button = __( 'Preview Changes' );
 } else {
        $preview_link = set_url_scheme( get_permalink( $post->ID ) );
        $preview_button = __( 'Preview Changes' );
 } else {
        $preview_link = set_url_scheme( get_permalink( $post->ID ) );

+

        /**
         * Filter the URI of a post preview in the post submit box.
         *
         * @since 2.0.5
        /**
         * Filter the URI of a post preview in the post submit box.
         *
         * @since 2.0.5

+        * @since 4.0.0 $post parameter was added.

         *
         *

-        * @param string $preview_link URI the user will be directed to for a post preview.
+        * @param string  $preview_link URI the user will be directed to for a post preview.
+        * @param WP_Post $post         Post object.

         */
         */

-       $preview_link = esc_url( apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ) ) );
+       $preview_link = esc_url( apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post ) );

        $preview_button = __( 'Preview' );
 }
 ?>
        $preview_button = __( 'Preview' );
 }
 ?>


@@ -276,11 +279,6 @@ if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0
  * @param object $post
  */
 function attachment_submit_meta_box( $post ) {
  * @param object $post
  */
 function attachment_submit_meta_box( $post ) {

-       global $action;
-
-       $post_type = $post->post_type;
-       $post_type_object = get_post_type_object($post_type);
-       $can_publish = current_user_can($post_type_object->cap->publish_posts);

 ?>
 <div class="submitbox" id="submitpost">
 
 ?>
 <div class="submitbox" id="submitpost">
 


@@ -347,7 +345,15 @@ function attachment_submit_meta_box( $post ) {
  *
  * @since 3.1.0
  *
  *
  * @since 3.1.0
  *

- * @param object $post
+ * @param WP_Post $post Post object.
+ * @param array   $box {
+ *     Post formats meta box arguments.
+ *
+ *     @type string   $id       Meta box ID.
+ *     @type string   $title    Meta box title.
+ *     @type callback $callback Meta box display callback.
+ *     @type array    $args     Extra meta box arguments.
+ * }

  */
 function post_format_meta_box( $post, $box ) {
        if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
  */
 function post_format_meta_box( $post, $box ) {
        if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :


@@ -375,17 +381,32 @@ function post_format_meta_box( $post, $box ) {
  *
  * @since 2.6.0
  *
  *
  * @since 2.6.0
  *

- * @param object $post
+ * @todo Create taxonomy-agnostic wrapper for this.
+ *
+ * @param WP_Post $post Post object.
+ * @param array   $box {
+ *     Tags meta box arguments.
+ *
+ *     @type string   $id       Meta box ID.
+ *     @type string   $title    Meta box title.
+ *     @type callback $callback Meta box display callback.
+ *     @type array    $args {
+ *         Extra meta box arguments.
+ *
+ *         @type string $taxonomy Taxonomy. Default 'post_tag'.
+ *     }
+ * }

  */
  */

-function post_tags_meta_box($post, $box) {
-       $defaults = array('taxonomy' => 'post_tag');
-       if ( !isset($box['args']) || !is_array($box['args']) )
+function post_tags_meta_box( $post, $box ) {
+       $defaults = array( 'taxonomy' => 'post_tag' );
+       if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {

                $args = array();
                $args = array();

-       else
+       } else {

                $args = $box['args'];
                $args = $box['args'];

-       extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-       $tax_name = esc_attr($taxonomy);
-       $taxonomy = get_taxonomy($taxonomy);
+       }
+       $r = wp_parse_args( $args, $defaults );
+       $tax_name = esc_attr( $r['taxonomy'] );
+       $taxonomy = get_taxonomy( $r['taxonomy'] );

        $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
        $comma = _x( ',', 'tag delimiter' );
 ?>
        $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
        $comma = _x( ',', 'tag delimiter' );
 ?>


@@ -417,59 +438,74 @@ function post_tags_meta_box($post, $box) {
  *
  * @since 2.6.0
  *
  *
  * @since 2.6.0
  *

- * @param object $post
+ * @todo Create taxonomy-agnostic wrapper for this.
+ *
+ * @param WP_Post $post Post object.
+ * @param array   $box {
+ *     Categories meta box arguments.
+ *
+ *     @type string   $id       Meta box ID.
+ *     @type string   $title    Meta box title.
+ *     @type callback $callback Meta box display callback.
+ *     @type array    $args {
+ *         Extra meta box arguments.
+ *
+ *         @type string $taxonomy Taxonomy. Default 'category'.
+ *     }
+ * }

  */
 function post_categories_meta_box( $post, $box ) {
  */
 function post_categories_meta_box( $post, $box ) {

-       $defaults = array('taxonomy' => 'category');
-       if ( !isset($box['args']) || !is_array($box['args']) )
+       $defaults = array( 'taxonomy' => 'category' );
+       if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {

                $args = array();
                $args = array();

-       else
+       } else {

                $args = $box['args'];
                $args = $box['args'];

-       extract( wp_parse_args($args, $defaults), EXTR_SKIP );
-       $tax = get_taxonomy($taxonomy);
-
+       }
+       $r = wp_parse_args( $args, $defaults );
+       $tax_name = esc_attr( $r['taxonomy'] );
+       $taxonomy = get_taxonomy( $r['taxonomy'] );

        ?>
        ?>

-       <div id="taxonomy-<?php echo $taxonomy; ?>" class="categorydiv">
-               <ul id="<?php echo $taxonomy; ?>-tabs" class="category-tabs">
-                       <li class="tabs"><a href="#<?php echo $taxonomy; ?>-all"><?php echo $tax->labels->all_items; ?></a></li>
-                       <li class="hide-if-no-js"><a href="#<?php echo $taxonomy; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+       <div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
+               <ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
+                       <li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
+                       <li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>

                </ul>
 
                </ul>
 

-               <div id="<?php echo $taxonomy; ?>-pop" class="tabs-panel" style="display: none;">
-                       <ul id="<?php echo $taxonomy; ?>checklist-pop" class="categorychecklist form-no-clear" >
-                               <?php $popular_ids = wp_popular_terms_checklist($taxonomy); ?>
+               <div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
+                       <ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
+                               <?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>

                        </ul>
                </div>
 
                        </ul>
                </div>
 

-               <div id="<?php echo $taxonomy; ?>-all" class="tabs-panel">
+               <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">

                        <?php
                        <?php

-            $name = ( $taxonomy == 'category' ) ? 'post_category' : 'tax_input[' . $taxonomy . ']';
+            $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';

             echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
             ?>
             echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
             ?>

-                       <ul id="<?php echo $taxonomy; ?>checklist" data-wp-lists="list:<?php echo $taxonomy?>" class="categorychecklist form-no-clear">
-                               <?php wp_terms_checklist($post->ID, array( 'taxonomy' => $taxonomy, 'popular_cats' => $popular_ids ) ) ?>
+                       <ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
+                               <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>

                        </ul>
                </div>
                        </ul>
                </div>

-       <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
-                       <div id="<?php echo $taxonomy; ?>-adder" class="wp-hidden-children">
+       <?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+                       <div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">

                                <h4>
                                <h4>

-                                       <a id="<?php echo $taxonomy; ?>-add-toggle" href="#<?php echo $taxonomy; ?>-add" class="hide-if-no-js">
+                                       <a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">

                                                <?php
                                                        /* translators: %s: add new taxonomy label */
                                                <?php
                                                        /* translators: %s: add new taxonomy label */

-                                                       printf( __( '+ %s' ), $tax->labels->add_new_item );
+                                                       printf( __( '+ %s' ), $taxonomy->labels->add_new_item );

                                                ?>
                                        </a>
                                </h4>
                                                ?>
                                        </a>
                                </h4>

-                               <p id="<?php echo $taxonomy; ?>-add" class="category-add wp-hidden-child">
-                                       <label class="screen-reader-text" for="new<?php echo $taxonomy; ?>"><?php echo $tax->labels->add_new_item; ?></label>
-                                       <input type="text" name="new<?php echo $taxonomy; ?>" id="new<?php echo $taxonomy; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $tax->labels->new_item_name ); ?>" aria-required="true"/>
-                                       <label class="screen-reader-text" for="new<?php echo $taxonomy; ?>_parent">
-                                               <?php echo $tax->labels->parent_item_colon; ?>
+                               <p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
+                                       <label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
+                                       <input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
+                                       <label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
+                                               <?php echo $taxonomy->labels->parent_item_colon; ?>

                                        </label>
                                        </label>

-                                       <?php wp_dropdown_categories( array( 'taxonomy' => $taxonomy, 'hide_empty' => 0, 'name' => 'new'.$taxonomy.'_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; ' . $tax->labels->parent_item . ' &mdash;' ) ); ?>
-                                       <input type="button" id="<?php echo $taxonomy; ?>-add-submit" data-wp-lists="add:<?php echo $taxonomy ?>checklist:<?php echo $taxonomy ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" />
-                                       <?php wp_nonce_field( 'add-'.$taxonomy, '_ajax_nonce-add-'.$taxonomy, false ); ?>
-                                       <span id="<?php echo $taxonomy; ?>-ajax-response"></span>
+                                       <?php wp_dropdown_categories( array( 'taxonomy' => $tax_name, 'hide_empty' => 0, 'name' => 'new' . $tax_name . '_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;' ) ); ?>
+                                       <input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>" />
+                                       <?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+                                       <span id="<?php echo $tax_name; ?>-ajax-response"></span>

                                </p>
                        </div>
                <?php endif; ?>
                                </p>
                        </div>
                <?php endif; ?>


@@ -589,8 +625,6 @@ function post_comment_meta_box_thead($result) {
  * @param object $post
  */
 function post_comment_meta_box( $post ) {
  * @param object $post
  */
 function post_comment_meta_box( $post ) {

-       global $wpdb;
-

        wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
        ?>
        <p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
        wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
        ?>
        <p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>