WordPress.org

Make WordPress Core

Ticket #19433: extra_space_3.patch

File extra_space_3.patch, 73.3 KB (added by kenan3008, 6 years ago)
  • wp-admin/admin-ajax.php

     
    970970                // Drafts and auto-drafts are just overwritten by autosave
    971971                if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) {
    972972                        $id = edit_post();
    973                 } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
     973                } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
    974974                        $revision_id = wp_create_post_autosave( $post->ID );
    975975                        if ( is_wp_error($revision_id) )
    976976                                $id = $revision_id;
  • wp-admin/custom-header.php

     
    676676                        $oitar = $width / HEADER_IMAGE_WIDTH;
    677677                        $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
    678678                        if ( is_wp_error( $image ) )
    679                                 wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
     679                                wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
    680680
    681681                        $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
    682682
     
    737737
    738738                $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT );
    739739                if ( is_wp_error( $cropped ) )
    740                         wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) );
     740                        wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
    741741
    742742                $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
    743743
  • wp-admin/edit-form-advanced.php

     
    8787if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
    8888        foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
    8989                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
    90                         $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below.  <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
     90                        $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
    9191                        break;
    9292                }
    9393        }
  • wp-admin/edit-tag-form.php

     
    2424else
    2525        do_action('edit_tag_form_pre', $tag);
    2626
    27 do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy);  ?>
     27do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
    2828
    2929<div class="wrap">
    3030<?php screen_icon(); ?>
  • wp-admin/edit.php

     
    133133                        break;
    134134        }
    135135
    136         $sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view'), $sendback );
     136        $sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
    137137
    138138        wp_redirect($sendback);
    139139        exit();
  • wp-admin/export.php

     
    4141get_current_screen()->add_help_tab( array(
    4242        'id'      => 'overview',
    4343        'title'   => __('Overview'),
    44         'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to  limit the export by category, author, date range by month, or publishing status.') . '</p>' .
     44        'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
    4545                '<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
    4646) );
    4747
  • wp-admin/import.php

     
    2020        'id'      => 'overview',
    2121        'title'   => __('Overview'),
    2222        'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
    23                 '<p>' . __('In previous versions of WordPress, all importers were built-in.  They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
     23                '<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
    2424) );
    2525
    2626
  • wp-admin/includes/dashboard.php

     
    8686        if ( !isset( $widget_options['dashboard_primary'] ) ) {
    8787                $update = true;
    8888                $widget_options['dashboard_primary'] = array(
    89                         'link' => apply_filters( 'dashboard_primary_link',  __( 'http://wordpress.org/news/' ) ),
    90                         'url' => apply_filters( 'dashboard_primary_feed',  __( 'http://wordpress.org/news/feed/' ) ),
     89                        'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
     90                        'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
    9191                        'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
    9292                        'items' => 2,
    9393                        'show_summary' => 1,
     
    101101        if ( !isset( $widget_options['dashboard_secondary'] ) ) {
    102102                $update = true;
    103103                $widget_options['dashboard_secondary'] = array(
    104                         'link' => apply_filters( 'dashboard_secondary_link',  __( 'http://planet.wordpress.org/' ) ),
    105                         'url' => apply_filters( 'dashboard_secondary_feed',  __( 'http://planet.wordpress.org/feed/' ) ),
     104                        'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
     105                        'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
    106106                        'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
    107107                        'items' => 5,
    108108                        'show_summary' => 0,
     
    273273
    274274        echo '</tr><tr>';
    275275        /* TODO: Show status breakdown on hover
    276         if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
     276        if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
    277277                $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
    278278        }
    279279        if ( $can_edit_posts && !empty($num_posts->draft) ) {
     
    700700                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
    701701                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
    702702                $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
    703                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */  _x( 'Spam', 'verb' ) . '</a>';
     703                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
    704704                if ( !EMPTY_TRASH_DAYS )
    705705                        $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
    706706                else
     
    11151115        if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
    11161116                $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
    11171117                $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
    1118                 // title is optional.  If black, fill it if possible
     1118                // title is optional. If black, fill it if possible
    11191119                if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
    11201120                        $rss = fetch_feed($widget_options[$widget_id]['url']);
    11211121                        if ( is_wp_error($rss) ) {
     
    12901290        <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
    12911291
    12921292        <div class="welcome-panel-content">
    1293         <h3><?php _e( 'Welcome to your new WordPress site! ' ); ?></h3>
     1293        <h3><?php _e( 'Welcome to your new WordPress site!' ); ?></h3>
    12941294        <p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you&#8217;d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?></p>
    12951295        <div class="welcome-panel-column-container">
    12961296        <div class="welcome-panel-column">
  • wp-admin/includes/deprecated.php

     
    133133 * @deprecated Use register_setting()
    134134 * @see register_setting()
    135135 *
    136  * @param string $option_group A settings group name.  Should correspond to a whitelisted option key name.
     136 * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
    137137 *      Default whitelisted option key names include "general," "discussion," and "reading," among others.
    138138 * @param string $option_name The name of an option to sanitize and save.
    139139 * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
     
    870870 * @deprecated Use get_current_screen()->add_help_tab()
    871871 * @see WP_Screen
    872872 *
    873  * @param string    $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions.
     873 * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
    874874 * @param string    $help   The content of an 'Overview' help tab.
    875875 */
    876876function add_contextual_help( $screen, $help ) {
  • wp-admin/includes/file.php

     
    157157 * Please note that the calling function must unlink() this itself.
    158158 *
    159159 * The filename is based off the passed parameter or defaults to the current unix timestamp,
    160  * while the directory can either be passed as well, or by leaving  it blank, default to a writable temporary directory.
     160 * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
    161161 *
    162162 * @since 2.6.0
    163163 *
     
    240240        // You may define your own function and pass the name in $overrides['upload_error_handler']
    241241        $upload_error_handler = 'wp_handle_upload_error';
    242242
    243         // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file.  Handle that gracefully.
     243        // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
    244244        if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
    245245                return $upload_error_handler( $file, $file['error'] );
    246246
     
    364364
    365365/**
    366366 * Handle sideloads, which is the process of retrieving a media item from another server instead of
    367  * a traditional media upload.  This process involves sanitizing the filename, checking extensions
     367 * a traditional media upload. This process involves sanitizing the filename, checking extensions
    368368 * for mime type, and moving the file to the appropriate directory within the uploads directory.
    369369 *
    370370 * @since 2.6.0
     
    486486
    487487/**
    488488 * Downloads a url to a local temporary file using the WordPress HTTP Class.
    489  * Please note, That the calling function must unlink() the  file.
     489 * Please note, That the calling function must unlink() the file.
    490490 *
    491491 * @since 2.5.0
    492492 *
     
    884884}
    885885
    886886/**
    887  * Displays a form to the user to request for their FTP/SSH details in order to  connect to the filesystem.
     887 * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
    888888 * All chosen/entered details are saved, Excluding the Password.
    889889 *
    890890 * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
     
    896896 * @param string $form_post the URL to post the form to
    897897 * @param string $type the chosen Filesystem method in use
    898898 * @param boolean $error if the current request has failed to connect
    899  * @param string $context The directory which is needed access to, The write-test will be performed on  this directory by get_filesystem_method()
     899 * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
    900900 * @param string $extra_fields Extra POST fields which should be checked for to be included in the post.
    901901 * @return boolean False on failure. True on success.
    902902 */
  • wp-admin/includes/image-edit.php

     
    192192        </tbody></table>
    193193        <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
    194194        <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script>
    195         <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost.  'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
     195        <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
    196196        </div>
    197197<?php
    198198}
  • wp-admin/includes/image.php

     
    205205
    206206        // exif contains a bunch of data we'll probably never need formatted in ways
    207207        // that are difficult to use. We'll normalize it and just extract the fields
    208         // that are likely to be useful.  Fractions and numbers are converted to
     208        // that are likely to be useful. Fractions and numbers are converted to
    209209        // floats, dates to unix timestamps, and everything else to strings.
    210210        $meta = array(
    211211                'aperture' => 0,
  • wp-admin/includes/meta-boxes.php

     
    2727
    2828<div id="minor-publishing-actions">
    2929<div id="save-action">
    30 <?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status )  { ?>
     30<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
    3131<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" tabindex="4" class="button button-highlighted" />
    3232<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
    3333<input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" tabindex="4" class="button button-highlighted" />
     
    639639<div id="delete-action">
    640640<?php
    641641if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
    642         <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
     642        <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
    643643<?php } ?>
    644644</div>
    645645
     
    789789                                                <label for="contact">
    790790                                                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
    791791                                                <label for="acquaintance">
    792                                                 <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />  <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
     792                                                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
    793793                                                <label for="friend">
    794794                                                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
    795795                                                <label for="friendship">
     
    833833                                        <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
    834834                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
    835835                                                <label for="child">
    836                                                 <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?>  />
     836                                                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
    837837                                                <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
    838838                                                <label for="kin">
    839                                                 <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?>  />
     839                                                <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
    840840                                                <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
    841841                                                <label for="parent">
    842842                                                <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />
     
    894894        </tr>
    895895        <tr class="form-field">
    896896                <th valign="top"  scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
    897                 <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo  ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
     897                <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
    898898        </tr>
    899899        <tr class="form-field">
    900900                <th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
  • wp-admin/includes/ms.php

     
    4949 * @since 3.0.0
    5050 *
    5151 * @param int $blog_id Blog ID
    52  * @param bool $drop True if blog's table should be dropped.  Default is false.
     52 * @param bool $drop True if blog's table should be dropped. Default is false.
    5353 * @return void
    5454 */
    5555function wpmu_delete_blog( $blog_id, $drop = false ) {
     
    115115                        $index++;
    116116                }
    117117
    118                 $stack = array_reverse( $stack );  // Last added dirs are deepest
     118                $stack = array_reverse( $stack ); // Last added dirs are deepest
    119119                foreach( (array) $stack as $dir ) {
    120120                        if ( $dir != $top_dir)
    121121                        @rmdir( $dir );
     
    430430function update_user_status( $id, $pref, $value, $deprecated = null ) {
    431431        global $wpdb;
    432432
    433         if ( null !== $deprecated  )
     433        if ( null !== $deprecated )
    434434                _deprecated_argument( __FUNCTION__, '3.1' );
    435435
    436436        $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
     
    549549                        $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
    550550                } else {
    551551                        $translated = format_code_lang( $code_lang );
    552                         $output[$translated] =  '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
     552                        $output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
    553553                }
    554554
    555555        }
     
    634634                                <?php foreach( (array) $all_blogs as $blog ) {
    635635                                        if ( $primary_blog == $blog->userblog_id )
    636636                                                $found = true;
    637                                         ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog,  $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
     637                                        ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
    638638                                } ?>
    639639                        </select>
    640640                        <?php
     
    771771 * Whether or not we have a large network.
    772772 *
    773773 * The default criteria for a large network is either more than 10,000 users or more than 10,000 sites.
    774  * Plugins can alter this criteria  using the 'wp_is_large_network' filter.
     774 * Plugins can alter this criteria using the 'wp_is_large_network' filter.
    775775 *
    776776 * @since 3.3.0
    777  * @param string $using 'sites or 'users'.  Default is 'sites'.
     777 * @param string $using 'sites or 'users'. Default is 'sites'.
    778778 * @return bool True if the network meets the criteria for large. False otherwise.
    779779 */
    780780function wp_is_large_network( $using = 'sites' ) {
  • wp-admin/includes/nav-menu.php

     
    77 * @since 3.0.0
    88 * @uses Walker_Nav_Menu
    99 */
    10 class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
     10class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
    1111        /**
    1212         * @see Walker_Nav_Menu::start_lvl()
    1313         * @since 3.0.0
     
    209209 * @since 3.0.0
    210210 * @uses Walker_Nav_Menu
    211211 */
    212 class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu  {
     212class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
    213213        function __construct( $fields = false ) {
    214214                if ( $fields ) {
    215215                        $this->db_fields = $fields;
     
    990990                                (
    991991                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
    992992                                        in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
    993                                         ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||  // or it's not a custom menu item (but not the custom home page)
     993                                        ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
    994994                                        ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
    995995                                )
    996996                        ) {
  • wp-admin/includes/plugin-install.php

     
    199199        }
    200200
    201201        if ( 'install' == $status ) {
    202                 if ( is_dir( WP_PLUGIN_DIR  . '/' . $api->slug ) ) {
     202                if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
    203203                        $installed_plugin = get_plugins('/' . $api->slug);
    204204                        if ( empty($installed_plugin) ) {
    205205                                if ( current_user_can('install_plugins') )
     
    322322<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
    323323                        <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
    324324<?php endif; if ( ! empty($api->homepage) ) : ?>
    325                         <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
     325                        <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
    326326<?php endif; ?>
    327327                </ul>
    328328                <?php if ( ! empty($api->rating) ) : ?>
  • wp-admin/includes/plugin.php

     
    882882
    883883        $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
    884884
    885         if ( null === $position  )
     885        if ( null === $position )
    886886                $menu[] = $new_menu;
    887887        else
    888888                $menu[$position] = $new_menu;
     
    985985        }
    986986
    987987        // If the parent doesn't already have a submenu, add a link to the parent
    988         // as the first item in the submenu.  If the submenu file is the same as the
    989         // parent file someone is trying to link back to the parent manually.  In
     988        // as the first item in the submenu. If the submenu file is the same as the
     989        // parent file someone is trying to link back to the parent manually. In
    990990        // this case, don't automatically add a link back to avoid duplication.
    991         if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug  ) {
     991        if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
    992992                foreach ( (array)$menu as $parent_menu ) {
    993993                        if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
    994994                                $submenu[$parent_slug][] = $parent_menu;
     
    10021002                add_action( $hookname, $function );
    10031003
    10041004        $_registered_pages[$hookname] = true;
    1005         // backwards-compatibility for plugins using add_management page.  See wp-admin/admin.php for redirect from edit.php to tools.php
     1005        // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
    10061006        if ( 'tools.php' == $parent_slug )
    10071007                $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
    10081008
     
    15891589 *
    15901590 * @since 2.7.0
    15911591 *
    1592  * @param string $option_group A settings group name.  Should correspond to a whitelisted option key name.
     1592 * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
    15931593 *      Default whitelisted option key names include "general," "discussion," and "reading," among others.
    15941594 * @param string $option_name The name of an option to sanitize and save.
    15951595 * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
     
    17151715 *
    17161716 * @since 2.7.0
    17171717 *
    1718  * @param string $option_group A settings group name.  This should match the group name used in register_setting().
     1718 * @param string $option_group A settings group name. This should match the group name used in register_setting().
    17191719 */
    17201720function settings_fields($option_group) {
    17211721        echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
  • wp-admin/includes/post.php

     
    171171        $post_data = _wp_translate_postdata( true, $post_data );
    172172        if ( is_wp_error($post_data) )
    173173                wp_die( $post_data->get_error_message() );
    174         if ( 'autosave' != $post_data['action']  && 'auto-draft' == $post_data['post_status'] )
     174        if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
    175175                $post_data['post_status'] = 'draft';
    176176
    177177        if ( isset($post_data['visibility']) ) {
     
    352352                $tax_names = get_object_taxonomies( $post );
    353353                foreach ( $tax_names as $tax_name ) {
    354354                        $taxonomy_obj = get_taxonomy($tax_name);
    355                         if (  isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
     355                        if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
    356356                                $new_terms = $tax_input[$tax_name];
    357357                        else
    358358                                $new_terms = array();
     
    12591259        if ( is_wp_error( $translated ) )
    12601260                return $translated;
    12611261
    1262         // Only store one autosave.  If there is already an autosave, overwrite it.
     1262        // Only store one autosave. If there is already an autosave, overwrite it.
    12631263        if ( $old_autosave = wp_get_post_autosave( $post_id ) ) {
    12641264                $new_autosave = _wp_post_revision_fields( $_POST, true );
    12651265                $new_autosave['ID'] = $old_autosave->ID;
     
    13201320
    13211321        if ( 'draft' == $post->post_status ) {
    13221322                $id = edit_post();
    1323         } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision.
     1323        } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
    13241324                $id = wp_create_post_autosave( $post->ID );
    13251325                if ( ! is_wp_error($id) )
    13261326                        $id = $post->ID;
  • wp-admin/includes/schema.php

     
    3030 * @since 3.3.0
    3131 *
    3232 * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
    33  * @param int $blog_id Optional. The blog ID for which to retrieve SQL.  Default is the current blog ID.
     33 * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
    3434 * @return string The SQL needed to create the requested tables.
    3535 */
    3636function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
  • wp-admin/includes/screen.php

     
    196196 * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
    197197 *      or an existing screen object.
    198198 */
    199 function set_current_screen( $hook_name =  '' ) {
     199function set_current_screen( $hook_name = '' ) {
    200200        WP_Screen::get( $hook_name )->set_current_screen();
    201201}
    202202
     
    208208 */
    209209final class WP_Screen {
    210210        /**
    211          * Any action associated with the screen. 'add' for *-add.php and *-new.php screens.  Empty otherwise.
     211         * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise.
    212212         *
    213213         * @since 3.3.0
    214214         * @var string
     
    217217        public $action;
    218218
    219219        /**
    220          * The base type of the screen.  This is typically the same as $id but with any post types and taxonomies stripped.
     220         * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped.
    221221         * For example, for an $id of 'edit-post' the base is 'edit'.
    222222         *
    223223         * @since 3.3.0
     
    539539         *
    540540         * @since 3.3.0
    541541         *
    542          * @param string $parent_file The parent file of the screen.  Typically the $parent_file global.
     542         * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
    543543         */
    544544        function set_parentage( $parent_file ) {
    545545                $this->parent_file = $parent_file;
     
    809809                                                                $welcome_checked = false;
    810810                                                }
    811811                                                echo '<label for="wp_welcome_panel-hide">';
    812                                                 echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false )  . ' />';
     812                                                echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
    813813                                                echo __( 'Welcome' ) . "</label>\n";
    814814                                        }
    815815                                ?>
     
    817817                        </div>
    818818                        <?php endif;
    819819                        if ( ! empty( $columns ) ) : ?>
    820                         <h5><?php echo ( isset( $columns['_title'] ) ?  $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
     820                        <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
    821821                        <div class="metabox-prefs">
    822822                                <?php
    823823                                $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
  • wp-admin/includes/taxonomy.php

     
    8686 *
    8787 * @param mixed $catarr See defaults below. Set 'cat_ID' to a non-zero value to update an existing category. The 'taxonomy' key was added in 3.0.0.
    8888 * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values.
    89  * @return int|object The ID number of the new or updated Category on success.  Zero or a WP_Error on failure, depending on param $wp_error.
     89 * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
    9090 */
    9191function wp_insert_category($catarr, $wp_error = false) {
    9292        $cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
     
    145145 *
    146146 * @since 2.0.0
    147147 *
    148  * @param array $catarr The 'cat_ID' value is required.  All other keys are optional.
     148 * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
    149149 * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
    150150 */
    151151function wp_update_category($catarr) {
  • wp-admin/includes/template.php

     
    13001300                                        if ( 'attachment' == $post->name )
    13011301                                                continue;
    13021302                                ?>
    1303                                 <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name,  'post'); ?> />
     1303                                <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name, 'post'); ?> />
    13041304                                <label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
    13051305                                <?php
    13061306                                } ?>
     
    14091409do_action('admin_head');
    14101410?>
    14111411</head>
    1412 <body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>  class="wp-admin no-js iframe <?php echo apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class; ?>">
     1412<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin no-js iframe <?php echo apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class; ?>">
    14131413<script type="text/javascript">
    14141414//<![CDATA[
    14151415(function(){
  • wp-admin/includes/theme-install.php

     
    2424 *
    2525 * @since 2.8.0
    2626 *
    27  * @deprecated since 3.1.0  Use get_theme_feature_list() instead.
     27 * @deprecated since 3.1.0 Use get_theme_feature_list() instead.
    2828 *
    2929 * @return array
    3030 */
    3131function install_themes_feature_list( ) {
    3232        if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
    33                 set_transient( 'wporg_theme_feature_list', array( ),  10800);
     33                set_transient( 'wporg_theme_feature_list', array( ), 10800);
    3434
    35         if ( $cache  )
     35        if ( $cache )
    3636                return $cache;
    3737
    3838        $feature_list = themes_api( 'feature_list', array( ) );
     
    134134        $name = wp_kses($theme->name, $themes_allowedtags);
    135135        $desc = wp_kses($theme->description, $themes_allowedtags);
    136136        //if ( strlen($desc) > 30 )
    137         //      $desc =  substr($desc, 0, 15) . '<span class="dots">...</span><span>' . substr($desc, -15) . '</span>';
     137        //      $desc = substr($desc, 0, 15) . '<span class="dots">...</span><span>' . substr($desc, -15) . '</span>';
    138138
    139139        $preview_link = $theme->preview_url . '?TB_iframe=true&amp;width=600&amp;height=400';
    140140        if ( !is_array($actions) ) {
  • wp-admin/includes/theme.php

     
    253253                $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
    254254                $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
    255255                $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
    256                 $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
     256                $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
    257257
    258258                if ( !is_multisite() ) {
    259259                        if ( ! current_user_can('update_themes') )
     
    271271 *
    272272 * @since 3.1.0
    273273 *
    274  * @return array  Array of features keyed by category with translations keyed by slug.
     274 * @return array Array of features keyed by category with translations keyed by slug.
    275275 */
    276276function get_theme_feature_list() {
    277277        // Hard-coded list is used if api not accessible.
     
    340340                return $features;
    341341
    342342        if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
    343                 set_site_transient( 'wporg_theme_feature_list', array( ),  10800);
     343                set_site_transient( 'wporg_theme_feature_list', array( ), 10800);
    344344
    345345        if ( !$feature_list ) {
    346346                $feature_list = themes_api( 'feature_list', array( ) );
  • wp-admin/includes/update-core.php

     
    264264 * introduced version present here being older than the current installed version.
    265265 *
    266266 * The content of this array should follow the following format:
    267  *  Filename (relative to wp-content) => Introduced version
     267 * Filename (relative to wp-content) => Introduced version
    268268 * Directories should be noted by suffixing it with a trailing slash (/)
    269269 *
    270270 * @since 3.2.0
  • wp-admin/includes/update.php

     
    142142        if ( current_user_can('update_core') ) {
    143143                $cur = get_preferred_from_update_core();
    144144
    145                 if ( isset( $cur->response ) && $cur->response == 'upgrade'  )
     145                if ( isset( $cur->response ) && $cur->response == 'upgrade' )
    146146                        $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
    147147        }
    148148
  • wp-admin/includes/upgrade.php

     
    5858        if ( ! $public )
    5959                update_option('default_pingback_flag', 0);
    6060
    61         // Create default user.  If the user already exists, the user tables are
    62         // being shared among blogs.  Just set the role in that case.
     61        // Create default user. If the user already exists, the user tables are
     62        // being shared among blogs. Just set the role in that case.
    6363        $user_id = username_exists($user_name);
    6464        $user_password = trim($user_password);
    6565        $email_password = false;
     
    7474                $message = '<em>'.__('Your chosen password.').'</em>';
    7575                $user_id = wp_create_user($user_name, $user_password, $user_email);
    7676        } else {
    77                 $message =  __('User already exists. Password inherited.');
     77                $message = __('User already exists. Password inherited.');
    7878        }
    7979
    8080        $user = new WP_User($user_id);
     
    358358
    359359        $wp_current_db_version = __get_option('db_version');
    360360
    361         // We are up-to-date.  Nothing to do.
     361        // We are up-to-date. Nothing to do.
    362362        if ( $wp_db_version == $wp_current_db_version )
    363363                return;
    364364
     
    394394        global $wp_current_db_version, $wp_db_version, $wp_rewrite;
    395395        $wp_current_db_version = __get_option('db_version');
    396396
    397         // We are up-to-date.  Nothing to do.
     397        // We are up-to-date. Nothing to do.
    398398        if ( $wp_db_version == $wp_current_db_version )
    399399                return;
    400400
     
    646646        $active_plugins = __get_option('active_plugins');
    647647
    648648        // If plugins are not stored in an array, they're stored in the old
    649         // newline separated format.  Convert to new format.
     649        // newline separated format. Convert to new format.
    650650        if ( !is_array( $active_plugins ) ) {
    651651                $active_plugins = explode("\n", trim($active_plugins));
    652652                update_option('active_plugins', $active_plugins);
     
    898898                $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
    899899        }
    900900
    901         // < 3570 we used linkcategories.  >= 3570 we used categories and link2cat.
     901        // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
    902902        if ( $wp_current_db_version < 3570 ) {
    903                 // Create link_category terms for link categories.  Create a map of link cat IDs
     903                // Create link_category terms for link categories. Create a map of link cat IDs
    904904                // to link_category terms.
    905905                $link_cat_id_map = array();
    906906                $default_link_cat = 0;
     
    16671667 *
    16681668 * @since 1.5.0
    16691669 */
    1670 function make_db_current_silent(  $tables = 'all' ) {
     1670function make_db_current_silent( $tables = 'all' ) {
    16711671        $alterations = dbDelta( $tables );
    16721672}
    16731673
     
    16901690                return false;
    16911691
    16921692        // Copy files from the old locations to the site theme.
    1693         // TODO: This does not copy arbitrary include dependencies.  Only the
     1693        // TODO: This does not copy arbitrary include dependencies. Only the
    16941694        // standard WP files are copied.
    16951695        $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
    16961696
     
    18481848
    18491849        if (file_exists(ABSPATH . 'wp-layout.css')) {
    18501850                if (! make_site_theme_from_oldschool($theme_name, $template)) {
    1851                         // TODO:  rm -rf the site theme directory.
     1851                        // TODO: rm -rf the site theme directory.
    18521852                        return false;
    18531853                }
    18541854        } else {
    18551855                if (! make_site_theme_from_default($theme_name, $template))
    1856                         // TODO:  rm -rf the site theme directory.
     1856                        // TODO: rm -rf the site theme directory.
    18571857                        return false;
    18581858        }
    18591859
     
    19381938
    19391939        // Upgrade versions prior to 2.9
    19401940        if ( $wp_current_db_version < 11557 ) {
    1941                 // Delete duplicate options.  Keep the option with the highest option_id.
     1941                // Delete duplicate options. Keep the option with the highest option_id.
    19421942                $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
    19431943
    19441944                // Drop the old primary key and add the new.
  • wp-admin/install.php

     
    207207                        $error = true;
    208208                } elseif ( ! is_email( $admin_email ) ) {
    209209                        // TODO: poka-yoke
    210                         display_setup_form( __( 'that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>' ) );
     210                        display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
    211211                        $error = true;
    212212                }
    213213
  • wp-admin/link-parse-opml.php

     
    1111
    1212global $opml, $map;
    1313
    14 // columns we wish to find are:  link_url, link_name, link_target, link_description
     14// columns we wish to find are: link_url, link_name, link_target, link_description
    1515// we need to map XML attribute names to our columns
    1616$opml_map = array('URL'         => 'link_url',
    1717        'HTMLURL'     => 'link_url',
  • wp-admin/maint/repair.php

     
    1919<?php
    2020
    2121if ( !defined('WP_ALLOW_REPAIR') ) {
    22         echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file.  Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
     22        echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    2323} elseif ( isset($_GET['repair']) ) {
    2424        check_admin_referer('repair_db');
    2525
     
    4949                        printf( __( 'The %s table is okay.' ), $table );
    5050                } else {
    5151                        /* translators: 1: table name, 2: error message, */
    52                         printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s.  WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
     52                        printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
    5353
    5454                        $repair = $wpdb->get_row("REPAIR TABLE $table");
    5555
     
    5959                                printf( __( 'Successfully repaired the %s table.' ), $table );
    6060                        } else {
    6161                                /* translators: 1: table name, 2: error message, */
    62                                 echo sprintf( __( 'Failed to repair the  %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
     62                                echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
    6363                                $problems[$table] = $check->Msg_text;
    6464                                $okay = false;
    6565                        }
     
    9595                        $problem_output[] = "$table: $problem";
    9696                echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>';
    9797        } else {
    98                 echo '<p>'.__('Repairs complete.  Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
     98                echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
    9999        }
    100100} else {
    101101        if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
    102102                _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.');
    103103        else
    104                 _e('WordPress can automatically look for some common database problems and repair them.  Repairing can take a while, so please be patient.')
     104                _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.')
    105105?>
    106106        <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
    107         <?php _e('WordPress can also attempt to optimize the database.  This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
     107        <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
    108108        <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
    109109<?php
    110110}
  • wp-admin/nav-menus.php

     
    430430
    431431// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth
    432432if ( is_nav_menu( $nav_menu_selected_id ) )
    433         $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  );
     433        $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
    434434
    435435function wp_nav_menu_max_depth($classes) {
    436436        global $_wp_nav_menu_max_depth;
     
    545545                                                        <div class="major-publishing-actions">
    546546                                                                <label class="menu-name-label howto open-label" for="menu-name">
    547547                                                                        <span><?php _e('Menu Name'); ?></span>
    548                                                                         <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title  ); ?>" />
     548                                                                        <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" />
    549549                                                                </label>
    550550                                                                <?php if ( !empty( $nav_menu_selected_id ) ) :
    551551                                                                        if ( ! isset( $auto_add ) ) {
  • wp-admin/network/menu.php

     
    5656
    5757unset($update_data);
    5858
    59 $submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core',  'update-core.php' );
     59$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
    6060$submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
    6161
    6262$menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
  • wp-admin/network/settings.php

     
    322322                        $menu_perms = get_site_option( 'menu_items' );
    323323                        $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
    324324                        foreach ( (array) $menu_items as $key => $val ) {
    325                                 echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" .  ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
     325                                echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
    326326                        }
    327327                        ?>
    328328                                </td>
  • wp-admin/network/site-info.php

     
    108108);
    109109foreach ( $tabs as $tab_id => $tab ) {
    110110        $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
    111         echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>';
     111        echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
    112112}
    113113?>
    114114</h3>
  • wp-admin/network/site-settings.php

     
    9898);
    9999foreach ( $tabs as $tab_id => $tab ) {
    100100        $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
    101         echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>';
     101        echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
    102102}
    103103?>
    104104</h3>
  • wp-admin/network/site-themes.php

     
    152152);
    153153foreach ( $tabs as $tab_id => $tab ) {
    154154        $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
    155         echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>';
     155        echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
    156156}
    157157?>
    158158</h3><?php
  • wp-admin/options-discussion.php

     
    164164
    165165<h3><?php _e('Avatars'); ?></h3>
    166166
    167 <p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites.  Here you can enable the display of avatars for people who comment on your site.'); ?></p>
     167<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
    168168
    169169<?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
    170170
  • wp-admin/options-general.php

     
    9898</tr>
    9999<tr valign="top">
    100100<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
    101 <td><input name="blogdescription" type="text" id="blogdescription"  value="<?php form_option('blogdescription'); ?>" class="regular-text" />
     101<td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
    102102<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
    103103</tr>
    104104<?php if ( !is_multisite() ) { ?>
     
    151151
    152152$check_zone_info = true;
    153153
    154 // Remove old Etc mappings.  Fallback to gmt_offset.
     154// Remove old Etc mappings. Fallback to gmt_offset.
    155155if ( false !== strpos($tzstring,'Etc/GMT') )
    156156        $tzstring = '';
    157157
     
    211211                        echo ' ';
    212212                        $message = $tr['isdst'] ?
    213213                                __('Daylight saving time begins on: <code>%s</code>.') :
    214                                 __('Standard time begins  on: <code>%s</code>.');
     214                                __('Standard time begins on: <code>%s</code>.');
    215215                        // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
    216216                        printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
    217217                } else {
  • wp-admin/options-permalink.php

     
    257257<?php wp_nonce_field('update-permalink') ?>
    258258        <p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
    259259</form>
    260 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.')  ?></p>
     260<p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
    261261                <?php else : ?>
    262262<p><?php _e('If the root directory of your site were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
    263263<form action="options-permalink.php" method="post">
    264264<?php wp_nonce_field('update-permalink') ?>
    265265        <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
    266266</form>
    267 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.')  ?></p>
     267<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
    268268                <?php endif; ?>
    269269        <?php endif; ?>
    270270<?php else :
  • wp-admin/options-reading.php

     
    115115<tr valign="top">
    116116<th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
    117117<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
    118 <p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Full text' ); ?></label><br />
     118<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>  /> <?php _e( 'Full text' ); ?></label><br />
    119119<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
    120120</fieldset></td>
    121121</tr>
  • wp-admin/options-writing.php

     
    3232if ( is_multisite() ) {
    3333        $post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>';
    3434} else {
    35         $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post.  You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
     35        $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
    3636}
    3737
    3838get_current_screen()->add_help_tab( array(
  • wp-admin/options.php

     
    151151        }
    152152
    153153        /**
    154          *  Handle settings errors and return to options page
     154         * Handle settings errors and return to options page
    155155         */
    156156        // If no settings errors were registered add a general 'updated' message.
    157157        if ( !count( get_settings_errors() ) )
  • wp-admin/plugin-editor.php

     
    236236                <?php endif; ?>
    237237<?php if ( is_writeable($real_file) ) : ?>
    238238        <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
    239                 <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
     239                <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
    240240        <?php } ?>
    241241        <p class="submit">
    242242        <?php
  • wp-admin/plugins.php

     
    355355        if ( isset( $_GET['main'] ) )
    356356                $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
    357357        elseif ( isset($_GET['charsout']) )
    358                 $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation.  If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
     358                $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
    359359        else
    360360                $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
    361361        ?>
  • wp-admin/press-this.php

     
    432432                        show('video');
    433433                <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
    434434                        show('video');
    435                 <?php  } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
     435                <?php } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
    436436                        show('photo');
    437437                <?php } ?>
    438438                jQuery('#title').unbind();
     
    605605
    606606                $content = '';
    607607                if ( $selection )
    608                         $content .=  $selection;
     608                        $content .= $selection;
    609609
    610610                if ( $url ) {
    611611                        $content .= '<p>';
  • wp-admin/themes.php

     
    7676?>
    7777
    7878<?php if ( ! validate_current_theme() ) : ?>
    79 <div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div>
     79<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
    8080<?php elseif ( isset($_GET['activated']) ) :
    8181                if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>
    8282<div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php
     
    120120                        if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) $class = ' class="current"';
    121121
    122122                        if ( !empty($submenu[$item[2]]) ) {
    123                                 $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
     123                                $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
    124124                                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
    125125                                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
    126126                                        $options[] = "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
  • wp-admin/tools.php

     
    2020        'id'      => 'converter',
    2121        'title'   => __('Categories and Tags Converter'),
    2222        'content' => '<p>' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierachy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
    23         '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen  and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
     23        '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
    2424) );
    2525
    2626get_current_screen()->set_help_sidebar(
  • wp-admin/update-core.php

     
    3636        $mysql_version  = $wpdb->db_version();
    3737        $show_buttons = true;
    3838        if ( 'development' == $update->response ) {
    39                 $message = __('You are using a development version of WordPress.  You can update to the latest nightly build automatically or download the nightly build and install it manually:');
     39                $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:');
    4040                $download = __('Download nightly build');
    4141        } else {
    4242                if ( $current ) {
     
    317317                echo "
    318318        <tr class='active'>
    319319                <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th>
    320                 <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" .  sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
     320                <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
    321321        </tr>";
    322322        }
    323323?>
  • wp-admin/upgrade.php

     
    2727else
    2828        $step = 0;
    2929
    30 // Do it.  No output.
     30// Do it. No output.
    3131if ( 'upgrade_db' === $step ) {
    3232        wp_upgrade();
    3333        die( '0' );
     
    8888        case 1:
    8989                wp_upgrade();
    9090
    91                         $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) :  __get_option( 'home' ) . '/';
     91                        $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
    9292                        $backto = esc_url( $backto );
    9393                        $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
    9494?>
  • wp-admin/user-new.php

     
    8080
    8181Please click the following link to confirm the invite:
    8282%4$s' );
    83                         wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ),  sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
     83                        wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
    8484                        $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
    8585                }
    8686        }
     
    163163'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
    164164                                '<ul>' .
    165165                                '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
    166                                 '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.')  . '</li>' .
     166                                '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
    167167                                '<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
    168168                                '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
    169169                                '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
     
    251251        if ( $do_both )
    252252                echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
    253253        if ( !is_super_admin() ) {
    254                 _e( 'Enter the email address of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
     254                _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
    255255                $label = __('E-mail');
    256256        } else {
    257                 _e( 'Enter the email address or username of an existing user on this network to invite them to this site.  That person will be sent an email asking them to confirm the invite.' );
     257                _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
    258258                $label = __('E-mail or Username');
    259259        }
    260260?>
     
    361361        <?php if ( is_multisite() && is_super_admin() ) { ?>
    362362        <tr>
    363363                <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
    364                 <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1"  <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
     364                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
    365365        </tr>
    366366        <?php } ?>
    367367</table>
  • wp-admin/users.php

     
    3333        'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
    3434                                        '<ul>' .
    3535                                        '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
    36                                         '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users.  Unused User Roles are not listed.') . '</li>' .
     36                                        '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
    3737                                        '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
    3838                                        '</ul>'
    3939) );