Ticket #8714: 8714.4.diff
File 8714.4.diff, 17.5 KB (added by , 13 years ago) |
---|
-
wp-admin/edit.php
110 110 111 111 if ( $post_del->post_type == 'attachment' ) { 112 112 if ( ! wp_delete_attachment($post_id) ) 113 wp_die( __( 'Error in deleting...') );113 wp_die( __( 'Error in deleting…' ) ); 114 114 } else { 115 115 if ( !wp_delete_post($post_id) ) 116 wp_die( __( 'Error in deleting...') );116 wp_die( __( 'Error in deleting…' ) ); 117 117 } 118 118 $deleted++; 119 119 } -
wp-admin/includes/class-wp-comments-list-table.php
449 449 $author_url = ''; 450 450 $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url ); 451 451 if ( strlen( $author_url_display ) > 50 ) 452 $author_url_display = substr( $author_url_display, 0, 49 ) . ' ...';452 $author_url_display = substr( $author_url_display, 0, 49 ) . '…'; 453 453 454 454 echo "<strong>"; comment_author(); echo '</strong><br />'; 455 455 if ( !empty( $author_url ) ) -
wp-admin/includes/dashboard.php
825 825 $publisher = "<strong>$publisher</strong>"; 826 826 827 827 $content = $item->get_content(); 828 $content = wp_html_excerpt($content, 50) . ' ...';828 $content = wp_html_excerpt($content, 50) . ' …'; 829 829 830 830 if ( $link ) 831 831 /* translators: incoming links feed, %1$s is other person, %3$s is content */ -
wp-admin/includes/misc.php
223 223 $short_url = str_replace( 'www.', '', $short_url ); 224 224 $short_url = untrailingslashit( $short_url ); 225 225 if ( strlen( $short_url ) > 35 ) 226 $short_url = substr( $short_url, 0, 32 ) . ' ...';226 $short_url = substr( $short_url, 0, 32 ) . '…'; 227 227 return $short_url; 228 228 } 229 229 -
wp-admin/includes/upgrade.php
245 245 246 246 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like piña coladas. (And gettin' caught in the rain.)</blockquote> 247 247 248 ...or something like this:248 …or something like this: 249 249 250 250 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickies to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote> 251 251 -
wp-admin/network.php
103 103 $parent_file = 'tools.php'; 104 104 } 105 105 106 $network_help = '<p>' . __( 'This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .107 '<p>' . __( 'Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .108 '<p>' . __( 'The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .109 '<p>' . __( 'Add a <code>blogs.dir</code> directory under <code>/wp-content</code> and add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .110 '<p>' . __( 'Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .111 '<p>' . __( 'The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version.') . '</p>' .112 '<p><strong>' . __( 'For more information:') . '</strong></p>' .113 '<p>' . __( '<a href="http://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>') . '</p>' .114 '<p>' . __( '<a href="http://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>') . '</p>';106 $network_help = '<p>' . __( 'This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.' ) . '</p>' . 107 '<p>' . __( 'Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).' ) . '</p>' . 108 '<p>' . __( 'The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.' ) . '</p>' . 109 '<p>' . __( 'Add a <code>blogs.dir</code> directory under <code>/wp-content</code> and add the designated lines of code to wp-config.php (just before <code>/*…stop editing…*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).' ) . '</p>' . 110 '<p>' . __( 'Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.' ) . '</p>' . 111 '<p>' . __( 'The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with “/blog/” from the main site. This disabling will be addressed in a future version.' ) . '</p>' . 112 '<p><strong>' . __( 'For more information:' ) . '</strong></p>' . 113 '<p>' . __( '<a href="http://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>' ) . '</p>' . 114 '<p>' . __( '<a href="http://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>' ) . '</p>'; 115 115 116 116 get_current_screen()->add_help_tab( array( 117 117 'id' => 'network', -
wp-admin/press-this.php
582 582 </div> 583 583 </div> 584 584 585 <div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php esc_html_e( 'Loading ...' ); ?></div>585 <div id="waiting" style="display: none"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php esc_html_e( 'Loading…' ); ?></div> 586 586 587 587 <div id="extra-fields" style="display: none"></div> 588 588 -
wp-admin/theme-editor.php
119 119 $functions = wp_doc_link_parse( $content ); 120 120 121 121 $docs_select = '<select name="docs-list" id="docs-list">'; 122 $docs_select .= '<option value="">' . esc_attr__( 'Function Name ...' ) . '</option>';122 $docs_select .= '<option value="">' . esc_attr__( 'Function Name…' ) . '</option>'; 123 123 foreach ( $functions as $function ) { 124 124 $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>'; 125 125 } -
wp-admin/upload.php
97 97 wp_die( __( 'You are not allowed to move this post to the trash.' ) ); 98 98 99 99 if ( !wp_trash_post( $post_id ) ) 100 wp_die( __( 'Error in moving to trash ...' ) );100 wp_die( __( 'Error in moving to trash…' ) ); 101 101 } 102 102 $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location ); 103 103 break; … … 109 109 wp_die( __( 'You are not allowed to move this post out of the trash.' ) ); 110 110 111 111 if ( !wp_untrash_post( $post_id ) ) 112 wp_die( __( 'Error in restoring from trash ...' ) );112 wp_die( __( 'Error in restoring from trash…' ) ); 113 113 } 114 114 $location = add_query_arg( 'untrashed', count( $post_ids ), $location ); 115 115 break; … … 121 121 wp_die( __( 'You are not allowed to delete this post.' ) ); 122 122 123 123 if ( !wp_delete_attachment( $post_id_del ) ) 124 wp_die( __( 'Error in deleting ...' ) );124 wp_die( __( 'Error in deleting…' ) ); 125 125 } 126 126 $location = add_query_arg( 'deleted', count( $post_ids ), $location ); 127 127 break; -
wp-includes/class-wp-xmlrpc-server.php
4880 4880 4881 4881 // prevent really long link text 4882 4882 if ( strlen($context[1]) > 100 ) 4883 $context[1] = substr($context[1], 0, 100) . ' ...';4883 $context[1] = substr($context[1], 0, 100) . '…'; 4884 4884 4885 4885 $marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker 4886 4886 $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker … … 4898 4898 4899 4899 $pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom); 4900 4900 4901 $context = '[...] ' . esc_html( $excerpt ) . ' [ ...]';4901 $context = '[...] ' . esc_html( $excerpt ) . ' […]'; 4902 4902 $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom ); 4903 4903 4904 4904 $comment_post_ID = (int) $post_ID; -
wp-includes/comment-template.php
419 419 for ($i=0; $i<$k; $i++) { 420 420 $excerpt .= $blah[$i] . ' '; 421 421 } 422 $excerpt .= ($use_dotdotdot) ? ' ...' : '';422 $excerpt .= ($use_dotdotdot) ? '…' : ''; 423 423 return apply_filters('get_comment_excerpt', $excerpt); 424 424 } 425 425 -
wp-includes/comment.php
1721 1721 else 1722 1722 $excerpt = apply_filters('the_excerpt', $post->post_excerpt); 1723 1723 $excerpt = str_replace(']]>', ']]>', $excerpt); 1724 $excerpt = wp_html_excerpt($excerpt, 252) . ' ...';1724 $excerpt = wp_html_excerpt($excerpt, 252) . '…'; 1725 1725 1726 1726 $post_title = apply_filters('the_title', $post->post_title, $post->ID); 1727 1727 $post_title = strip_tags($post_title); -
wp-includes/deprecated.php
1704 1704 * @param int $cut Optional. Amount of words to keep for the content. 1705 1705 * @param int $encode_html Optional. How to encode the content. 1706 1706 */ 1707 function the_content_rss($more_link_text='(more ...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {1707 function the_content_rss($more_link_text='(more…)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) { 1708 1708 _deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' ); 1709 1709 $content = get_the_content($more_link_text, $stripteaser, $more_file); 1710 1710 $content = apply_filters('the_content_rss', $content); … … 1731 1731 /** @todo Check performance, might be faster to use array slice instead. */ 1732 1732 for ( $i=0; $i<$k; $i++ ) 1733 1733 $excerpt .= $blah[$i].' '; 1734 $excerpt .= ($use_dotdotdot) ? ' ...' : '';1734 $excerpt .= ($use_dotdotdot) ? '…' : ''; 1735 1735 $content = $excerpt; 1736 1736 } 1737 1737 $content = str_replace(']]>', ']]>', $content); -
wp-includes/formatting.php
2035 2035 $text = apply_filters('the_content', $text); 2036 2036 $text = str_replace(']]>', ']]>', $text); 2037 2037 $excerpt_length = apply_filters('excerpt_length', 55); 2038 $excerpt_more = apply_filters('excerpt_more', ' ' . '[ ...]');2038 $excerpt_more = apply_filters('excerpt_more', ' ' . '[…]'); 2039 2039 $text = wp_trim_words( $text, $excerpt_length, $excerpt_more ); 2040 2040 } 2041 2041 return apply_filters('wp_trim_excerpt', $text, $raw_excerpt); -
wp-includes/pluggable.php
1040 1040 /* translators: 1: comment author, 2: author IP, 3: author domain */ 1041 1041 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1042 1042 $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; 1043 $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[ ...] %s [...]', $comment->comment_content ) . "\r\n\r\n";1043 $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[…] %s […]', $comment->comment_content ) . "\r\n\r\n"; 1044 1044 $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n"; 1045 1045 /* translators: 1: blog name, 2: post title */ 1046 1046 $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); -
wp-includes/post-template.php
181 181 global $post, $more, $page, $pages, $multipage, $preview; 182 182 183 183 if ( null === $more_link_text ) 184 $more_link_text = __( '(more ...)' );184 $more_link_text = __( '(more…)' ); 185 185 186 186 $output = ''; 187 187 $hasTeaser = false; -
wp-includes/post.php
3104 3104 // form an excerpt 3105 3105 $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content); 3106 3106 3107 if ( strlen($excerpt) > 255) {3108 $excerpt = substr( $excerpt,0,252) . '...';3107 if ( strlen( $excerpt ) > 255 ) { 3108 $excerpt = substr( $excerpt, 0, 252 ) . '…'; 3109 3109 } 3110 3110 3111 3111 $trackback_urls = explode(',', $tb_list); -
wp-login.php
241 241 $message = apply_filters('retrieve_password_message', $message, $key); 242 242 243 243 if ( $message && !wp_mail($user_email, $title, $message) ) 244 wp_die( __( 'The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );244 wp_die( __( 'The e-mail could not be sent.' ) . "<br />\n" . __( 'Possible reason: your host may have disabled the mail() function…' ) ); 245 245 246 246 return true; 247 247 } … … 331 331 $user_pass = wp_generate_password( 12, false); 332 332 $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email ); 333 333 if ( ! $user_id ) { 334 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you ...please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );334 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) ); 335 335 return $errors; 336 336 } 337 337 -
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;