Changeset 22783

Timestamp:

11/21/2012 06:53:00 PM (14 years ago)

Author:

nacin

Message:

Support attachment_fields_to_save and attachment_fields_to_edit for attachments going through post.php. see #22186. see #21391.

Location:

trunk

Files:

• wp-admin/css/wp-admin-rtl.css (modified) (1 diff)
• wp-admin/css/wp-admin.css (modified) (1 diff)
• wp-admin/includes/media.php (modified) (8 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin-rtl.css

@@ -921 +921 @@
         padding-left: 0;
         padding-right: 18px;
+}
+
+.compat-attachment-fields th {
+        padding-right: 0;
+        padding-left: 10px;
 }
 

trunk/wp-admin/css/wp-admin.css

@@ -3401 +3401 @@
 }
 
+.compat-attachment-fields th {
+        padding-top: 5px;
+        padding-right: 10px;
+}
+
 /*------------------------------------------------------------------------------
   11.2 - Post Revisions

trunk/wp-admin/includes/media.php

@@ -1277 +1277 @@
         $default_args = array(
                 'errors' => null,
+                'taxonomies' => false,
         );
 
@@ -1284 +1285 @@
         $form_fields = array();
 
-        foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
-                $t = (array) get_taxonomy($taxonomy);
-                if ( ! $t['public'] || ! $t['show_ui'] )
-                        continue;
-                if ( empty($t['label']) )
-                        $t['label'] = $taxonomy;
-                if ( empty($t['args']) )
-                        $t['args'] = array();
-
-                $terms = get_object_term_cache($post->ID, $taxonomy);
-                if ( false === $terms )
-                        $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
-
-                $values = array();
-
-                foreach ( $terms as $term )
-                        $values[] = $term->slug;
-                $t['value'] = join(', ', $values);
-
-                $form_fields[$taxonomy] = $t;
+        if ( $args['taxonomies'] ) {
+                foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
+                        $t = (array) get_taxonomy($taxonomy);
+                        if ( ! $t['public'] || ! $t['show_ui'] )
+                                continue;
+                        if ( empty($t['label']) )
+                                $t['label'] = $taxonomy;
+                        if ( empty($t['args']) )
+                                $t['args'] = array();
+
+                        $terms = get_object_term_cache($post->ID, $taxonomy);
+                        if ( false === $terms )
+                                $terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+
+                        $values = array();
+
+                        foreach ( $terms as $term )
+                                $values[] = $term->slug;
+                        $t['value'] = join(', ', $values);
+
+                        $form_fields[$taxonomy] = $t;
+                }
         }
 
@@ -1333 +1336 @@
 
                 $name = "attachments[$attachment_id][$id]";
+                $id_attr = "attachments-$attachment_id-$id";
 
                 if ( !empty( $field['tr'] ) ) {
@@ -1342 +1346 @@
 
                 if ( $field['input'] == 'hidden' ) {
-                        $hidden_fields[$id] = $field['value'];
+                        $hidden_fields[$name] = $field['value'];
                         continue;
                 }
@@ -1348 +1352 @@
                 $required      = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
                 $aria_required = $field['required'] ? " aria-required='true' " : '';
-                $class  = 'compat-item-' . $name;
+                $class  = 'compat-field-' . $id;
                 $class .= $field['required'] ? ' form-required' : '';
 
                 $item .= "\t\t<tr class='$class'>";
-                $item .= "\t\t\t<th valign='top' scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
+                $item .= "\t\t\t<th valign='top' scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
                 $item .= "</th>\n\t\t\t<td class='field'>";
 
@@ -1362 +1366 @@
                                 $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
                         }
-                        $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+                        $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
                 } else {
-                        $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
+                        $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
                 }
                 if ( !empty( $field['helps'] ) )
@@ -1389 +1393 @@
                 $item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
         if ( $item )
-                $item = '<table>' . $item . '</table>';
+                $item = '<table class="compat-attachment-fields">' . $item . '</table>';
 
         return array(
@@ -2286 +2290 @@
         </div>
         <?php
+        $extras = get_compat_media_markup( $post->ID );
+        echo $extras['item'];
+        foreach ( $extras['hidden'] as $hidden_field => $value ) {
+                echo '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
+        }
 }
 

trunk/wp-admin/includes/post.php

@@ -239 +239 @@
                         update_post_meta( $post_ID, '_wp_attachment_image_alt', addslashes( $image_alt ) );
                 }
+
+                if ( isset( $post_data['attachments'][ $post_ID ] ) )
+                        $post_data = apply_filters( 'attachment_fields_to_save', $post_data, $post_data['attachments'][ $post_ID ] );
         }
 

trunk/wp-includes/media.php

@@ -1294 +1294 @@
 
         if ( function_exists('get_compat_media_markup') )
-                $response['compat'] = get_compat_media_markup( $attachment->ID );
+                $response['compat'] = get_compat_media_markup( $attachment->ID, array( 'taxonomies' => true ) );
 
         return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );