Make WordPress Core

Ticket #8714: 8714.6.diff

File 8714.6.diff, 17.2 KB (added by SergeyBiryukov, 12 years ago)

Fixed a couple of misses in class-wp-xmlrpc-server.php and formatting.php

  • wp-admin/edit.php

     
    110110
    111111                                if ( $post_del->post_type == 'attachment' ) {
    112112                                        if ( ! wp_delete_attachment($post_id) )
    113                                                 wp_die( __('Error in deleting...') );
     113                                                wp_die( __( 'Error in deleting…' ) );
    114114                                } else {
    115115                                        if ( !wp_delete_post($post_id) )
    116                                                 wp_die( __('Error in deleting...') );
     116                                                wp_die( __( 'Error in deleting…' ) );
    117117                                }
    118118                                $deleted++;
    119119                        }
  • wp-admin/includes/class-wp-comments-list-table.php

     
    449449                        $author_url = '';
    450450                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
    451451                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 ) . '…';
    453453
    454454                echo "<strong>"; comment_author(); echo '</strong><br />';
    455455                if ( !empty( $author_url ) )
  • wp-admin/includes/dashboard.php

     
    804804                        $publisher = "<strong>$publisher</strong>";
    805805
    806806                $content = $item->get_content();
    807                 $content = wp_html_excerpt($content, 50) . ' ...';
     807                $content = wp_html_excerpt($content, 50) . ' &hellip;';
    808808
    809809                if ( $link )
    810810                        /* translators: incoming links feed, %1$s is other person, %3$s is content */
  • wp-admin/includes/misc.php

     
    223223        $short_url = str_replace( 'www.', '', $short_url );
    224224        $short_url = untrailingslashit( $short_url );
    225225        if ( strlen( $short_url ) > 35 )
    226                 $short_url = substr( $short_url, 0, 32 ) . '...';
     226                $short_url = substr( $short_url, 0, 32 ) . '&hellip;';
    227227        return $short_url;
    228228}
    229229
  • wp-admin/includes/upgrade.php

     
    245245
    246246<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&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
    247247
    248 ...or something like this:
     248&hellip;or something like this:
    249249
    250250<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>
    251251
  • wp-admin/network.php

     
    103103        $parent_file = 'tools.php';
    104104}
    105105
    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 &#8220;/blog/&#8221; 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>/*&hellip;stop editing&hellip;*/</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 &#8220;/blog/&#8221; 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>';
    115115
    116116get_current_screen()->add_help_tab( array(
    117117        'id'      => 'network',
  • wp-admin/press-this.php

     
    586586                        </div>
    587587                </div>
    588588
    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&hellip;' ); ?></div>
    590590
    591591                <div id="extra-fields" style="display: none"></div>
    592592
  • wp-admin/theme-editor.php

     
    111111                        $functions = wp_doc_link_parse( $content );
    112112
    113113                        $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&hellip;' ) . '</option>';
    115115                        foreach ( $functions as $function ) {
    116116                                $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
    117117                        }
  • wp-admin/upload.php

     
    9797                                        wp_die( __( 'You are not allowed to move this post to the trash.' ) );
    9898
    9999                                if ( !wp_trash_post( $post_id ) )
    100                                         wp_die( __( 'Error in moving to trash...' ) );
     100                                        wp_die( __( 'Error in moving to trash&hellip;' ) );
    101101                        }
    102102                        $location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
    103103                        break;
     
    109109                                        wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
    110110
    111111                                if ( !wp_untrash_post( $post_id ) )
    112                                         wp_die( __( 'Error in restoring from trash...' ) );
     112                                        wp_die( __( 'Error in restoring from trash&hellip;' ) );
    113113                        }
    114114                        $location = add_query_arg( 'untrashed', count( $post_ids ), $location );
    115115                        break;
     
    121121                                        wp_die( __( 'You are not allowed to delete this post.' ) );
    122122
    123123                                if ( !wp_delete_attachment( $post_id_del ) )
    124                                         wp_die( __( 'Error in deleting...' ) );
     124                                        wp_die( __( 'Error in deleting&hellip;' ) );
    125125                        }
    126126                        $location = add_query_arg( 'deleted', count( $post_ids ), $location );
    127127                        break;
  • wp-includes/class-wp-xmlrpc-server.php

     
    50155015
    50165016                                // prevent really long link text
    50175017                                if ( strlen($context[1]) > 100 )
    5018                                         $context[1] = substr($context[1], 0, 100) . '...';
     5018                                        $context[1] = substr($context[1], 0, 100) . '&hellip;';
    50195019
    50205020                                $marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
    50215021                                $excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
     
    50335033
    50345034                $pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
    50355035
    5036                 $context = '[...] ' . esc_html( $excerpt ) . ' [...]';
     5036                $context = '[&hellip;] ' . esc_html( $excerpt ) . ' [&hellip;]';
    50375037                $pagelinkedfrom = $wpdb->escape( $pagelinkedfrom );
    50385038
    50395039                $comment_post_ID = (int) $post_ID;
  • wp-includes/comment-template.php

     
    419419        for ($i=0; $i<$k; $i++) {
    420420                $excerpt .= $blah[$i] . ' ';
    421421        }
    422         $excerpt .= ($use_dotdotdot) ? '...' : '';
     422        $excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
    423423        return apply_filters('get_comment_excerpt', $excerpt);
    424424}
    425425
  • wp-includes/comment.php

     
    17171717        else
    17181718                $excerpt = apply_filters('the_excerpt', $post->post_excerpt);
    17191719        $excerpt = str_replace(']]>', ']]&gt;', $excerpt);
    1720         $excerpt = wp_html_excerpt($excerpt, 252) . '...';
     1720        $excerpt = wp_html_excerpt($excerpt, 252) . '&hellip;';
    17211721
    17221722        $post_title = apply_filters('the_title', $post->post_title, $post->ID);
    17231723        $post_title = strip_tags($post_title);
  • wp-includes/deprecated.php

     
    17041704 * @param int $cut Optional. Amount of words to keep for the content.
    17051705 * @param int $encode_html Optional. How to encode the content.
    17061706 */
    1707 function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
     1707function the_content_rss($more_link_text='(more&hellip;)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
    17081708        _deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
    17091709        $content = get_the_content($more_link_text, $stripteaser, $more_file);
    17101710        $content = apply_filters('the_content_rss', $content);
     
    17311731                /** @todo Check performance, might be faster to use array slice instead. */
    17321732                for ( $i=0; $i<$k; $i++ )
    17331733                        $excerpt .= $blah[$i].' ';
    1734                 $excerpt .= ($use_dotdotdot) ? '...' : '';
     1734                $excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
    17351735                $content = $excerpt;
    17361736        }
    17371737        $content = str_replace(']]>', ']]&gt;', $content);
  • wp-includes/formatting.php

     
    20972097 * Generates an excerpt from the content, if needed.
    20982098 *
    20992099 * 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 string
     2100 * that, then the string ' [&hellip;]' will be appended to the excerpt. If the string
    21012101 * is less than 55 words, then the content will be returned as is.
    21022102 *
    21032103 * 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 filter
     2104 * The ' [&hellip;]' string can be modified by plugins/themes using the excerpt_more filter
    21052105 *
    21062106 * @since 1.5.0
    21072107 *
     
    21182118                $text = apply_filters('the_content', $text);
    21192119                $text = str_replace(']]>', ']]&gt;', $text);
    21202120                $excerpt_length = apply_filters('excerpt_length', 55);
    2121                 $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
     2121                $excerpt_more = apply_filters('excerpt_more', ' ' . '[&hellip;]');
    21222122                $text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
    21232123        }
    21242124        return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
  • wp-includes/post-template.php

     
    181181        global $post, $more, $page, $pages, $multipage, $preview;
    182182
    183183        if ( null === $more_link_text )
    184                 $more_link_text = __( '(more...)' );
     184                $more_link_text = __( '(more&hellip;)' );
    185185
    186186        $output = '';
    187187        $hasTeaser = false;
  • wp-includes/post.php

     
    31353135                // form an excerpt
    31363136                $excerpt = strip_tags($post_excerpt ? $post_excerpt : $post_content);
    31373137
    3138                 if (strlen($excerpt) > 255) {
    3139                         $excerpt = substr($excerpt,0,252) . '...';
     3138                if ( strlen( $excerpt ) > 255 ) {
     3139                        $excerpt = substr( $excerpt, 0, 252 ) . '&hellip;';
    31403140                }
    31413141
    31423142                $trackback_urls = explode(',', $tb_list);
  • wp-login.php

     
    245245        $message = apply_filters('retrieve_password_message', $message, $key);
    246246
    247247        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&hellip;' ) );
    249249
    250250        return true;
    251251}
     
    335335        $user_pass = wp_generate_password( 12, false);
    336336        $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
    337337        if ( ! $user_id ) {
    338                 $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;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&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
    339339                return $errors;
    340340        }
    341341
  • wp-trackback.php

     
    8787        if ( !pings_open($tb_id) )
    8888                trackback_response(1, 'Sorry, trackbacks are closed for this item.');
    8989
    90         $title =  wp_html_excerpt( $title, 250 ).'...';
    91         $excerpt = wp_html_excerpt( $excerpt, 252 ).'...';
     90        $title =  wp_html_excerpt( $title, 250 ) . '&hellip;';
     91        $excerpt = wp_html_excerpt( $excerpt, 252 ) . '&hellip;';
    9292
    9393        $comment_post_ID = (int) $tb_id;
    9494        $comment_author = $blog_name;