Changeset 29206 for trunk/src/wp-admin/includes/media.php

Timestamp:

07/17/2014 09:13:53 AM (12 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in wp-admin-directory files.

See #28931.

File:

• trunk/src/wp-admin/includes/media.php (modified) (16 diffs)

trunk/src/wp-admin/includes/media.php

@@ -181 +181 @@
         $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
         $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
-        // convert any remaining line breaks to <br>
+
+        // Convert any remaining line breaks to <br>.
         $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
 
@@ -209 +210 @@
  */
 function _cleanup_image_add_caption( $matches ) {
-        // remove any line breaks from inside the tags
+        // Remove any line breaks from inside the tags.
         return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
 }
@@ -318 +319 @@
                         $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
 
-        // use image exif/iptc data for title and caption defaults if possible
+        // Use image exif/iptc data for title and caption defaults if possible.
         } elseif ( $image_meta = @wp_read_image_metadata( $file ) ) {
                 if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
@@ -379 +380 @@
         $content = '';
 
-        // use image exif/iptc data for title and caption defaults if possible
+        // Use image exif/iptc data for title and caption defaults if possible.
         if ( $image_meta = @wp_read_image_metadata($file) ) {
                 if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
@@ -390 +391 @@
                 $title = $desc;
 
-        // Construct the attachment array
+        // Construct the attachment array.
         $attachment = array_merge( array(
                 'post_mime_type' => $type,
@@ -635 +636 @@
                         if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) {
                                 $image_alt = wp_strip_all_tags( $image_alt, true );
-                                // update_meta expects slashed
+
+                                // Update_meta expects slashed.
                                 update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
                         }
@@ -808 +810 @@
 function media_sideload_image( $file, $post_id, $desc = null ) {
         if ( ! empty( $file ) ) {
-                // Set variables for storage
-                // fix file filename for query strings
+                // Set variables for storage, fix file filename for query strings.
                 preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
                 $file_array['name'] = basename( $matches[0] );
-                // Download file to temp location
+
+                // Download file to temp location.
                 $file_array['tmp_name'] = download_url( $file );
 
@@ -820 +822 @@
                 }
 
-                // do the validation and storage stuff
+                // Do the validation and storage stuff.
                 $id = media_handle_sideload( $file_array, $post_id, $desc );
-                // If error storing permanently, unlink
+
+                // If error storing permanently, unlink.
                 if ( is_wp_error( $id ) ) {
                         @unlink( $file_array['tmp_name'] );
@@ -831 +834 @@
         }
 
-        // Finally check to make sure the file has been saved, then return the html
+        // Finally check to make sure the file has been saved, then return the HTML.
         if ( ! empty( $src ) ) {
                 $alt = isset( $desc ) ? esc_attr( $desc ) : '';
@@ -944 +947 @@
                         $checked = '';
 
-                        // is this size selectable?
+                        // Is this size selectable?
                         $enabled = ( $downsize[3] || 'full' == $size );
                         $css_id = "image-size-{$size}-{$post->ID}";
-                        // if this size is the default but that's not available, don't select it
+
+                        // If this size is the default but that's not available, don't select it.
                         if ( $size == $check ) {
                                 if ( $enabled )
@@ -954 +958 @@
                                         $check = '';
                         } elseif ( !$check && $enabled && 'thumbnail' != $size ) {
-                                // if $check is not enabled, default to the first available size that's bigger than a thumbnail
+                                /*
+                                 * If $check is not enabled, default to the first available size
+                                 * that's bigger than a thumbnail.
+                                 */
                                 $check = $size;
                                 $checked = " checked='checked'";
@@ -962 +969 @@
 
                         $html .= "<label for='{$css_id}'>$label</label>";
-                        // only show the dimensions if that choice is available
+
+                        // Only show the dimensions if that choice is available.
                         if ( $enabled )
                                 $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
@@ -1010 +1018 @@
 
 function wp_caption_input_textarea($edit_post) {
-        // post data is already escaped
+        // Post data is already escaped.
         $name = "attachments[{$edit_post->ID}][post_excerpt]";
 
@@ -1473 +1481 @@
                 elseif ( $field['input'] == 'textarea' ) {
                         if ( 'post_content' == $id && user_can_richedit() ) {
-                                // sanitize_post() skips the post_content when user_can_richedit
+                                // Sanitize_post() skips the post_content when user_can_richedit.
                                 $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
                         }
-                        // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit()
+                        // Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
                         $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
                 } else {
@@ -1622 +1630 @@
                 elseif ( $field['input'] == 'textarea' ) {
                         if ( 'post_content' == $id && user_can_richedit() ) {
-                                // sanitize_post() skips the post_content when user_can_richedit
+                                // sanitize_post() skips the post_content when user_can_richedit.
                                 $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
                         }
@@ -2853 +2861 @@
                                 if ( ! empty( $list ) ) {
                                         $metadata[$key] = reset( $list );
-                                        // fix bug in byte stream analysis
+                                        // Fix bug in byte stream analysis.
                                         if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
                                                 $metadata[$key] = 'Cop' . $metadata[$key];