diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
| commit | b764f60728be1d4e026f9d7ae618ab47e23322f8 (patch) | |
| tree | 1f1b45c4f1c1cf027b3240f605346e56209be8ff /wp-trackback.php | |
| parent | dad010666b767a1d06588d1d09c771c62f67c387 (diff) | |
| download | wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.gz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.xz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.zip | |
WP Merge to rev #4147
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-trackback.php')
| -rw-r--r-- | wp-trackback.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wp-trackback.php b/wp-trackback.php index cf93844..daa16c1 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -42,9 +42,9 @@ else $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS'; if ( function_exists('mb_convert_encoding') ) { // For international trackbacks - $title = mb_convert_encoding($title, get_settings('blog_charset'), $charset); - $excerpt = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset); - $blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset); + $title = mb_convert_encoding($title, get_option('blog_charset'), $charset); + $excerpt = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset); + $blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset); } if ( is_single() || is_page() ) @@ -70,8 +70,8 @@ if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) { $title = wp_specialchars( strip_tags( $title ) ); $excerpt = strip_tags($excerpt); if ( function_exists('mb_strcut') ) { // For international trackbacks - $excerpt = mb_strcut($excerpt, 0, 252, get_settings('blog_charset')) . '...'; - $title = mb_strcut($title, 0, 250, get_settings('blog_charset')) . '...'; + $excerpt = mb_strcut($excerpt, 0, 252, get_option('blog_charset')) . '...'; + $title = mb_strcut($title, 0, 250, get_option('blog_charset')) . '...'; } else { $excerpt = (strlen($excerpt) > 255) ? substr($excerpt, 0, 252) . '...' : $excerpt; $title = (strlen($title) > 250) ? substr($title, 0, 250) . '...' : $title; @@ -86,7 +86,7 @@ if ( !empty($tb_url) && !empty($title) && !empty($tb_url) ) { $dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'"); if ( $dupe ) - trackback_response(1, 'We already have a ping from that URI for this post.'); + trackback_response(1, 'We already have a ping from that URL for this post.'); $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type'); |