Ticket #8714: 8714.6.diff
| File 8714.6.diff, 17.2 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
804 804 $publisher = "<strong>$publisher</strong>"; 805 805 806 806 $content = $item->get_content(); 807 $content = wp_html_excerpt($content, 50) . ' ...';807 $content = wp_html_excerpt($content, 50) . ' …'; 808 808 809 809 if ( $link ) 810 810 /* 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
586 586 </div> 587 587 </div> 588 588 589 <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>589 <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> 590 590 591 591 <div id="extra-fields" style="display: none"></div> 592 592 -
wp-admin/theme-editor.php
111 111 $functions = wp_doc_link_parse( $content ); 112 112 113 113 $docs_select = '<select name="docs-list" id="docs-list">'; 114 $docs_select .= '<option value="">' . esc_attr__( 'Function Name ...' ) . '</option>';114 $docs_select .= '<option value="">' . esc_attr__( 'Function Name…' ) . '</option>'; 115 115 foreach ( $functions as $function ) { 116 116 $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>'; 117 117 } -
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
5015 5015 5016 5016 // prevent really long link text 5017 5017 if ( strlen($context[1]) > 100 ) 5018 $context[1] = substr($context[1], 0, 100) . ' ...';5018 $context[1] = substr($context[1], 0, 100) . '…'; 5019 5019 5020 5020 $marker = '<wpcontext>'.$context[1].'</wpcontext>'; // set up our marker 5021 5021 $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker … … 5033 5033 5034 5034 $pagelinkedfrom = str_replace('&', '&', $pagelinkedfrom); 5035 5035 5036 $context = '[ ...] ' . esc_html( $excerpt ) . ' [...]';5036 $context = '[…] ' . esc_html( $excerpt ) . ' […]'; 5037 5037 $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom ); 5038 5038 5039 5039 $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
1717 1717 else 1718 1718 $excerpt = apply_filters('the_excerpt', $post->post_excerpt); 1719 1719 $excerpt = str_replace(']]>', ']]>', $excerpt); 1720 $excerpt = wp_html_excerpt($excerpt, 252) . ' ...';1720 $excerpt = wp_html_excerpt($excerpt, 252) . '…'; 1721 1721 1722 1722 $post_title = apply_filters('the_title', $post->post_title, $post->ID); 1723 1723 $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
2097 2097 * Generates an excerpt from the content, if needed. 2098 2098 * 2099 2099 * The excerpt word amount will be 55 words and if the amount is greater than 2100 * that, then the string ' [ ...]' will be appended to the excerpt. If the string2100 * that, then the string ' […]' will be appended to the excerpt. If the string 2101 2101 * is less than 55 words, then the content will be returned as is. 2102 2102 * 2103 2103 * The 55 word limit can be modified by plugins/themes using the excerpt_length filter 2104 * The ' [ ...]' string can be modified by plugins/themes using the excerpt_more filter2104 * The ' […]' string can be modified by plugins/themes using the excerpt_more filter 2105 2105 * 2106 2106 * @since 1.5.0 2107 2107 * … … 2118 2118 $text = apply_filters('the_content', $text); 2119 2119 $text = str_replace(']]>', ']]>', $text); 2120 2120 $excerpt_length = apply_filters('excerpt_length', 55); 2121 $excerpt_more = apply_filters('excerpt_more', ' ' . '[ ...]');2121 $excerpt_more = apply_filters('excerpt_more', ' ' . '[…]'); 2122 2122 $text = wp_trim_words( $text, $excerpt_length, $excerpt_more ); 2123 2123 } 2124 2124 return apply_filters('wp_trim_excerpt', $text, $raw_excerpt); -
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
3135 3135 // form an excerpt 3136 3136 $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content); 3137 3137 3138 if ( strlen($excerpt) > 255) {3139 $excerpt = substr( $excerpt,0,252) . '...';3138 if ( strlen( $excerpt ) > 255 ) { 3139 $excerpt = substr( $excerpt, 0, 252 ) . '…'; 3140 3140 } 3141 3141 3142 3142 $trackback_urls = explode(',', $tb_list); -
wp-login.php
245 245 $message = apply_filters('retrieve_password_message', $message, $key); 246 246 247 247 if ( $message && !wp_mail($user_email, $title, $message) ) 248 wp_die( __( 'The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') );248 wp_die( __( 'The e-mail could not be sent.' ) . "<br />\n" . __( 'Possible reason: your host may have disabled the mail() function…' ) ); 249 249 250 250 return true; 251 251 } … … 335 335 $user_pass = wp_generate_password( 12, false); 336 336 $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email ); 337 337 if ( ! $user_id ) { 338 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you ...please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );338 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) ); 339 339 return $errors; 340 340 } 341 341 -
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;