Changeset 21905
- Timestamp:
- 09/18/2012 11:38:25 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/image.php
r21808 r21905 238 238 // headline, "A brief synopsis of the caption." 239 239 if ( ! empty( $iptc['2#105'][0] ) ) 240 $meta['title'] = utf8_encode( trim( $iptc['2#105'][0] ));240 $meta['title'] = trim( $iptc['2#105'][0] ); 241 241 // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways." 242 242 elseif ( ! empty( $iptc['2#005'][0] ) ) 243 $meta['title'] = utf8_encode( trim( $iptc['2#005'][0] ));243 $meta['title'] = trim( $iptc['2#005'][0] ); 244 244 245 245 if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption 246 $caption = utf8_encode( trim( $iptc['2#120'][0] ));246 $caption = trim( $iptc['2#120'][0] ); 247 247 if ( empty( $meta['title'] ) ) { 248 248 // Assume the title is stored in 2:120 if it's short. … … 257 257 258 258 if ( ! empty( $iptc['2#110'][0] ) ) // credit 259 $meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));259 $meta['credit'] = trim( $iptc['2#110'][0] ); 260 260 elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline 261 $meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));261 $meta['credit'] = trim( $iptc['2#080'][0] ); 262 262 263 263 if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time … … 265 265 266 266 if ( ! empty( $iptc['2#116'][0] ) ) // copyright 267 $meta['copyright'] = utf8_encode( trim( $iptc['2#116'][0] ));267 $meta['copyright'] = trim( $iptc['2#116'][0] ); 268 268 } 269 269 } … … 274 274 275 275 if ( !empty( $exif['Title'] ) ) 276 $meta['title'] = utf8_encode( trim( $exif['Title'] ));276 $meta['title'] = trim( $exif['Title'] ); 277 277 278 278 if ( ! empty( $exif['ImageDescription'] ) ) { 279 279 if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) { 280 280 // Assume the title is stored in ImageDescription 281 $meta['title'] = utf8_encode( trim( $exif['ImageDescription'] ));281 $meta['title'] = trim( $exif['ImageDescription'] ); 282 282 if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) 283 $meta['caption'] = utf8_encode( trim( $exif['COMPUTED']['UserComment'] ));283 $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] ); 284 284 } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) { 285 $meta['caption'] = utf8_encode( trim( $exif['ImageDescription'] ));285 $meta['caption'] = trim( $exif['ImageDescription'] ); 286 286 } 287 287 } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) { 288 $meta['caption'] = utf8_encode( trim( $exif['Comments'] ));288 $meta['caption'] = trim( $exif['Comments'] ); 289 289 } 290 290 291 291 if ( ! empty( $exif['Artist'] ) ) 292 $meta['credit'] = utf8_encode( trim( $exif['Artist'] ));292 $meta['credit'] = trim( $exif['Artist'] ); 293 293 elseif ( ! empty($exif['Author'] ) ) 294 $meta['credit'] = utf8_encode( trim( $exif['Author'] ));294 $meta['credit'] = trim( $exif['Author'] ); 295 295 296 296 if ( ! empty( $exif['Copyright'] ) ) 297 $meta['copyright'] = utf8_encode( trim( $exif['Copyright'] ));297 $meta['copyright'] = trim( $exif['Copyright'] ); 298 298 if ( ! empty($exif['FNumber'] ) ) 299 299 $meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 ); 300 300 if ( ! empty($exif['Model'] ) ) 301 $meta['camera'] = utf8_encode( trim( $exif['Model'] ));301 $meta['camera'] = trim( $exif['Model'] ); 302 302 if ( ! empty($exif['DateTimeDigitized'] ) ) 303 303 $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] ); … … 306 306 if ( ! empty($exif['ISOSpeedRatings'] ) ) { 307 307 $meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings']; 308 $meta['iso'] = utf8_encode( trim( $meta['iso'] ));308 $meta['iso'] = trim( $meta['iso'] ); 309 309 } 310 310 if ( ! empty($exif['ExposureTime'] ) ) 311 311 $meta['shutter_speed'] = wp_exif_frac2dec( $exif['ExposureTime'] ); 312 } 313 314 foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) { 315 if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) 316 $meta[ $key ] = utf8_encode( $meta[ $key ] ); 312 317 } 313 318
Note: See TracChangeset
for help on using the changeset viewer.