Ticket #17608: 17608.patch
| File 17608.patch, 9.6 KB (added by , 14 years ago) |
|---|
-
wp-login.php
232 232 $message = apply_filters('retrieve_password_message', $message, $key); 233 233 234 234 if ( $message && !wp_mail($user_email, $title, $message) ) 235 wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function ...') );235 wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function…') ); 236 236 237 237 return true; 238 238 } … … 324 324 $user_pass = wp_generate_password( 12, false); 325 325 $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email ); 326 326 if ( ! $user_id ) { 327 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you ...please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );327 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) ); 328 328 return $errors; 329 329 } 330 330 -
wp-includes/default-widgets.php
826 826 $desc = str_replace( array("\n", "\r"), ' ', esc_attr( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option('blog_charset') ) ) ) ); 827 827 $desc = wp_html_excerpt( $desc, 360 ); 828 828 829 // Append ellipsis. Change existing [...] to [& hellip;].829 // Append ellipsis. Change existing [...] to […]. 830 830 if ( '[...]' == substr( $desc, -5 ) ) 831 $desc = substr( $desc, 0, -5 ) . '[& hellip;]';832 elseif ( '[& hellip;]' != substr( $desc, -10) )833 $desc .= ' [& hellip;]';831 $desc = substr( $desc, 0, -5 ) . '[…]'; 832 elseif ( '[…]' != substr( $desc, -9 ) ) 833 $desc .= ' […]'; 834 834 835 835 $desc = esc_html( $desc ); 836 836 -
wp-includes/class-wp-xmlrpc-server.php
3545 3545 3546 3546 $pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom); 3547 3547 3548 $context = '[ ...] ' . esc_html( $excerpt ) . ' [...]';3548 $context = '[…] ' . esc_html( $excerpt ) . ' […]'; 3549 3549 $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom ); 3550 3550 3551 3551 $comment_post_ID = (int) $post_ID; -
wp-includes/formatting.php
1843 1843 * Generates an excerpt from the content, if needed. 1844 1844 * 1845 1845 * The excerpt word amount will be 55 words and if the amount is greater than 1846 * that, then the string ' [ ...]'will be appended to the excerpt. If the string1846 * that, then the string ' […]' ([...]) will be appended to the excerpt. If the string 1847 1847 * is less than 55 words, then the content will be returned as is. 1848 1848 * 1849 1849 * The 55 word limit can be modified by plugins/themes using the excerpt_length filter 1850 * The ' [ ...]' string can be modified by plugins/themes using the excerpt_more filter1850 * The ' […]' string can be modified by plugins/themes using the excerpt_more filter 1851 1851 * 1852 1852 * @since 1.5.0 1853 1853 * … … 1864 1864 $text = apply_filters('the_content', $text); 1865 1865 $text = str_replace(']]>', ']]>', $text); 1866 1866 $excerpt_length = apply_filters('excerpt_length', 55); 1867 $excerpt_more = apply_filters('excerpt_more', ' ' . '[ ...]');1867 $excerpt_more = apply_filters('excerpt_more', ' ' . '[…]'); 1868 1868 $text = wp_trim_words( $text, $excerpt_length, $excerpt_more ); 1869 1869 } 1870 1870 return apply_filters('wp_trim_excerpt', $text, $raw_excerpt); … … 1877 1877 * 1878 1878 * @param string $text Text to trim. 1879 1879 * @param int $num_words Number of words. Default 55. 1880 * @param string $more What to append if $text needs to be trimmed. Default '& hellip;'.1880 * @param string $more What to append if $text needs to be trimmed. Default '…'. 1881 1881 * @return string Trimmed text. 1882 1882 */ 1883 1883 function wp_trim_words( $text, $num_words = 55, $more = null ) { 1884 1884 if ( null === $more ) 1885 $more = __( '& hellip;' );1885 $more = __( '…' ); 1886 1886 $original_text = $text; 1887 1887 $text = wp_strip_all_tags( $text ); 1888 1888 $words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY ); -
wp-includes/pluggable.php
1026 1026 /* translators: 1: comment author, 2: author IP, 3: author domain */ 1027 1027 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1028 1028 $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; 1029 $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[ ...] %s [...]', $comment->comment_content ) . "\r\n\r\n";1029 $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[…] %s […]', $comment->comment_content ) . "\r\n\r\n"; 1030 1030 $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; 1031 1031 /* translators: 1: blog name, 2: post title */ 1032 1032 $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); -
wp-includes/script-loader.php
206 206 'file_cancelled' => __('File canceled.'), 207 207 'upload_stopped' => __('Upload stopped.'), 208 208 'dismiss' => __('Dismiss'), 209 'crunching' => __('Crunching& hellip;'),209 'crunching' => __('Crunching…'), 210 210 'deleted' => __('moved to the trash.'), 211 211 'error_uploading' => __('“%s” has failed to upload due to an error') 212 212 ); -
wp-trackback.php
87 87 if ( !pings_open($tb_id) ) 88 88 trackback_response(1, 'Sorry, trackbacks are closed for this item.'); 89 89 90 $title = wp_html_excerpt( $title, 250 ).' ...';91 $excerpt = wp_html_excerpt( $excerpt, 252 ).' ...';90 $title = wp_html_excerpt( $title, 250 ).'…'; 91 $excerpt = wp_html_excerpt( $excerpt, 252 ).'…'; 92 92 93 93 $comment_post_ID = (int) $tb_id; 94 94 $comment_author = $blog_name; … … 108 108 do_action('trackback_post', $wpdb->insert_id); 109 109 trackback_response(0); 110 110 } 111 ?> 112 No newline at end of file 111 ?> -
wp-admin/nav-menus.php
418 418 foreach( (array) $nav_menus as $key => $_nav_menu ) { 419 419 $_nav_menu->truncated_name = trim( wp_html_excerpt( $_nav_menu->name, 40 ) ); 420 420 if ( $_nav_menu->truncated_name != $_nav_menu->name ) 421 $_nav_menu->truncated_name .= '& hellip;';421 $_nav_menu->truncated_name .= '…'; 422 422 423 423 $nav_menus[$key]->truncated_name = $_nav_menu->truncated_name; 424 424 } -
wp-admin/setup-config.php
105 105 <li>Table prefix (if you want to run more than one WordPress in a single database) </li> 106 106 </ol> 107 107 <p><strong>If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p> 108 <p>In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready& hellip;</p>108 <p>In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…</p> 109 109 110 110 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&noapi'; ?>" class="button">Let’s go!</a></p> 111 111 <?php … … 263 263 chmod(ABSPATH . 'wp-config.php', 0666); 264 264 display_header(); 265 265 ?> 266 <p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to& hellip;</p>266 <p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…</p> 267 267 268 268 <p class="step"><a href="install.php" class="button">Run the install</a></p> 269 269 <?php -
wp-admin/plugin-editor.php
133 133 134 134 if ( !empty($functions) ) { 135 135 $docs_select = '<select name="docs-list" id="docs-list">'; 136 $docs_select .= '<option value="">' . __( 'Function Name& hellip;' ) . '</option>';136 $docs_select .= '<option value="">' . __( 'Function Name…' ) . '</option>'; 137 137 foreach ( $functions as $function) { 138 138 $docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>'; 139 139 }