WordPress.org

Make WordPress Core

Changeset 19596


Ignore:
Timestamp:
12/14/11 17:36:38 (3 years ago)
Author:
ryan
Message:

Remove extraneous spaces. Props kenan3008, dimadin. fixes #19501 #19433

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-tag-form.php

    r18078 r19596  
    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"> 
  • trunk/wp-admin/edit.php

    r19528 r19596  
    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); 
  • trunk/wp-admin/export.php

    r19509 r19596  
    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) ); 
  • trunk/wp-admin/includes/dashboard.php

    r19593 r19596  
    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, 
     
    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, 
     
    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>'; 
     
    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"> 
  • trunk/wp-admin/includes/file.php

    r19593 r19596  
    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 
     
    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 
     
    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 * 
     
    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. 
  • trunk/wp-admin/includes/meta-boxes.php

    r18818 r19596  
    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 ) { ?> 
     
    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> 
     
    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> 
     
    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"> 
     
    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"> 
  • trunk/wp-admin/includes/ms.php

    r19593 r19596  
    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) 
     
    431431    global $wpdb; 
    432432 
    433     if ( null !== $deprecated  ) 
     433    if ( null !== $deprecated ) 
    434434        _deprecated_argument( __FUNCTION__, '3.1' ); 
    435435 
     
    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 
     
    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> 
     
    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 
  • trunk/wp-admin/includes/nav-menu.php

    r19074 r19596  
    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() 
     
    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 ) { 
     
    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                ) 
  • trunk/wp-admin/includes/plugin-install.php

    r19593 r19596  
    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> 
  • trunk/wp-admin/includes/plugin.php

    r19593 r19596  
    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 
     
    989989    // 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] ) ) 
  • trunk/wp-admin/includes/post.php

    r19593 r19596  
    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 
     
    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 
  • trunk/wp-admin/includes/screen.php

    r19593 r19596  
    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} 
     
    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 
  • trunk/wp-admin/includes/template.php

    r19574 r19596  
    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 
     
    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[ 
  • trunk/wp-admin/includes/theme-install.php

    r19028 r19596  
    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 
     
    3131function install_themes_feature_list( ) { 
    3232    if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) 
    33         set_transient( 'wporg_theme_feature_list', array( ),  10800); 
    34  
    35     if ( $cache  ) 
     33        set_transient( 'wporg_theme_feature_list', array( ), 10800); 
     34 
     35    if ( $cache ) 
    3636        return $cache; 
    3737 
     
    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'; 
  • trunk/wp-admin/includes/theme.php

    r19593 r19596  
    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() { 
     
    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 ) { 
  • trunk/wp-admin/includes/update-core.php

    r19594 r19596  
    336336 * 
    337337 * The content of this array should follow the following format: 
    338  *  Filename (relative to wp-content) => Introduced version 
     338 * Filename (relative to wp-content) => Introduced version 
    339339 * Directories should be noted by suffixing it with a trailing slash (/) 
    340340 * 
  • trunk/wp-admin/includes/update.php

    r18843 r19596  
    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    } 
  • trunk/wp-admin/includes/upgrade.php

    r19593 r19596  
    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 
     
    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} 
     
    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    } 
  • trunk/wp-admin/link-parse-opml.php

    r16660 r19596  
    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', 
  • trunk/wp-admin/maint/repair.php

    r19593 r19596  
    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; 
  • trunk/wp-admin/nav-menus.php

    r19528 r19596  
    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) { 
     
    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 ) ) : 
  • trunk/wp-admin/network/menu.php

    r18839 r19596  
    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 
  • trunk/wp-admin/options-general.php

    r19593 r19596  
    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> 
     
    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']) ) ); 
  • trunk/wp-admin/options-permalink.php

    r19538 r19596  
    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> 
     
    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; ?> 
  • trunk/wp-admin/options-reading.php

    r19507 r19596  
    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> 
  • trunk/wp-admin/options.php

    r18841 r19596  
    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. 
  • trunk/wp-admin/press-this.php

    r19424 r19596  
    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 } ?> 
     
    606606        $content = ''; 
    607607        if ( $selection ) 
    608             $content .=  $selection; 
     608            $content .= $selection; 
    609609 
    610610        if ( $url ) { 
  • trunk/wp-admin/themes.php

    r19593 r19596  
    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)) 
  • trunk/wp-admin/tools.php

    r19509 r19596  
    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 
  • trunk/wp-admin/upgrade.php

    r19593 r19596  
    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' ) . '/'); 
  • trunk/wp-admin/user-new.php

    r19595 r19596  
    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        } 
     
    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 } ?> 
  • trunk/wp-includes/capabilities.php

    r19593 r19596  
    488488        global $wpdb; 
    489489 
    490         if ( 'id' == $field ) 
     490        if ( 'id' == $field ) { 
     491            // Make sure the value is numeric to avoid casting objects, for example, 
     492            // to int 1. 
     493            if ( ! is_numeric( $value ) ) 
     494                return false; 
    491495            $value = absint( $value ); 
    492         else 
     496        } else { 
    493497            $value = trim( $value ); 
     498        } 
    494499 
    495500        if ( !$value ) 
Note: See TracChangeset for help on using the changeset viewer.