diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-09-15 15:45:31 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-09-15 15:45:31 +0000 |
| commit | 0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8 (patch) | |
| tree | 5b95d4a59dbb761f8da80c9e894d22a7a547b00c /wp-admin/includes | |
| parent | 66b0871abeef45cdbe757c97a643076503b6c656 (diff) | |
| download | wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.gz wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.tar.xz wordpress-mu-0bea7c7ad2ee8e82a86919b1cd2fea517cc67ec8.zip | |
Merge with WP 2.6.2
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1471 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes')
| -rw-r--r-- | wp-admin/includes/image.php | 10 | ||||
| -rw-r--r-- | wp-admin/includes/template.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index 7699f98..8de2907 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -219,17 +219,17 @@ function wp_read_image_metadata( $file ) { if ( !empty($info['APP13']) ) { $iptc = iptcparse($info['APP13']); if ( !empty($iptc['2#110'][0]) ) // credit - $meta['credit'] = trim( $iptc['2#110'][0] ); + $meta['credit'] = utf8_encode(trim($iptc['2#110'][0])); elseif ( !empty($iptc['2#080'][0]) ) // byline - $meta['credit'] = trim( $iptc['2#080'][0] ); + $meta['credit'] = utf8_encode(trim($iptc['2#080'][0])); if ( !empty($iptc['2#055'][0]) and !empty($iptc['2#060'][0]) ) // created datee and time $meta['created_timestamp'] = strtotime($iptc['2#055'][0] . ' ' . $iptc['2#060'][0]); if ( !empty($iptc['2#120'][0]) ) // caption - $meta['caption'] = trim( $iptc['2#120'][0] ); + $meta['caption'] = utf8_encode(trim($iptc['2#120'][0])); if ( !empty($iptc['2#116'][0]) ) // copyright - $meta['copyright'] = trim( $iptc['2#116'][0] ); + $meta['copyright'] = utf8_encode(trim($iptc['2#116'][0])); if ( !empty($iptc['2#005'][0]) ) // title - $meta['title'] = trim( $iptc['2#005'][0] ); + $meta['title'] = utf8_encode(trim($iptc['2#005'][0])); } } diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 3d6aac5..e132733 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -715,7 +715,7 @@ function _wp_get_comment_list( $status = '', $s = false, $start, $num ) { $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num"); } else { - $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments USE INDEX (comment_date_gmt) WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" ); + $comments = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->comments WHERE $approved ORDER BY comment_date_gmt DESC LIMIT $start, $num" ); } update_comment_cache($comments); |