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

Timestamp:

07/17/2014 09:13:53 AM (11 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/image.php (modified) (9 diffs)

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

@@ -48 +48 @@
         $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
 
-    // The directory containing the original file may no longer exist when
-    // using a replication plugin.
+    /*
+     * The directory containing the original file may no longer exist when
+     * using a replication plugin.
+     */
     wp_mkdir_p( dirname( $dst_file ) );
 
@@ -80 +82 @@
         $metadata['height'] = $imagesize[1];
 
-        // Make the file path relative to the upload dir
+        // Make the file path relative to the upload dir.
         $metadata['file'] = _wp_relative_upload_path($file);
 
-        // make thumbnails and other intermediate sizes
+        // Make thumbnails and other intermediate sizes.
         global $_wp_additional_image_sizes;
 
@@ -121 +123 @@
         }
 
-        // fetch additional metadata from exif/iptc
+        // Fetch additional metadata from EXIF/IPTC.
         $image_meta = wp_read_image_metadata( $file );
         if ( $image_meta )
@@ -135 +137 @@
 
     if ( $support && ! empty( $metadata['image']['data'] ) ) {
-        // check for existing cover
+        // Check for existing cover.
         $hash = md5( $metadata['image']['data'] );
         $posts = get_posts( array(
@@ -188 +190 @@
     }
 
-    // remove the blob of binary data from the array
+    // Remove the blob of binary data from the array.
     if ( isset( $metadata['image']['data'] ) )
         unset( $metadata['image']['data'] );
@@ -255 +257 @@
     list( , , $sourceImageType ) = getimagesize( $file );
 
-    // exif contains a bunch of data we'll probably never need formatted in ways
-    // that are difficult to use. We'll normalize it and just extract the fields
-    // that are likely to be useful. Fractions and numbers are converted to
-    // floats, dates to unix timestamps, and everything else to strings.
+    /*
+     * EXIF contains a bunch of data we'll probably never need formatted in ways
+     * that are difficult to use. We'll normalize it and just extract the fields
+     * that are likely to be useful. Fractions and numbers are converted to
+     * floats, dates to unix timestamps, and everything else to strings.
+     */
     $meta = array(
         'aperture' => 0,
@@ -272 +276 @@
     );
 
-    // read iptc first, since it might contain data not available in exif such
-    // as caption, description etc
+    /*
+     * Read IPTC first, since it might contain data not available in exif such
+     * as caption, description etc.
+     */
     if ( is_callable( 'iptcparse' ) ) {
         getimagesize( $file, $info );
@@ -280 +286 @@
             $iptc = iptcparse( $info['APP13'] );
 
-            // headline, "A brief synopsis of the caption."
-            if ( ! empty( $iptc['2#105'][0] ) )
+            // Headline, "A brief synopsis of the caption."
+            if ( ! empty( $iptc['2#105'][0] ) ) {
                 $meta['title'] = trim( $iptc['2#105'][0] );
-            // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
-            elseif ( ! empty( $iptc['2#005'][0] ) )
+            /*
+             * Title, "Many use the Title field to store the filename of the image,
+             * though the field may be used in many ways."
+             */
+            } elseif ( ! empty( $iptc['2#005'][0] ) ) {
                 $meta['title'] = trim( $iptc['2#005'][0] );
+            }
 
             if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
@@ -569 +579 @@
         $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
-        // The directory containing the original file may no longer exist when
-        // using a replication plugin.
+        /*
+         * The directory containing the original file may no longer
+         * exist when using a replication plugin.
+         */
         wp_mkdir_p( dirname( $dst_file ) );