WordPress.org

Make WordPress Core

Changeset 15473


Ignore:
Timestamp:
07/27/10 18:02:45 (4 years ago)
Author:
markjaquith
Message:

These are not verbs. http://notaverb.com/badbad_verbs

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r14161 r15473  
    6666                echo '<p class="lead-in">'; 
    6767                if ( $signup->domain . $signup->path == '' ) { 
    68                     printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 
     68                    printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 
    6969                } else { 
    7070                    printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); 
  • trunk/wp-admin/includes/upgrade.php

    r15457 r15473  
    267267    $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) ); 
    268268 
    269     // Setup default widgets for default theme. 
     269    // Set up default widgets for default theme. 
    270270    update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) ); 
    271271    update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) ); 
  • trunk/wp-admin/nav-menus.php

    r15430 r15473  
    7171                $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) ); 
    7272 
    73                 // setup the data we need in one pass through the array of menu items 
     73                // set up the data we need in one pass through the array of menu items 
    7474                $dbids_to_orders = array(); 
    7575                $orders_to_dbids = array(); 
     
    145145                $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) ); 
    146146 
    147                 // setup the data we need in one pass through the array of menu items 
     147                // set up the data we need in one pass through the array of menu items 
    148148                $dbids_to_orders = array(); 
    149149                $orders_to_dbids = array(); 
  • trunk/wp-admin/update-core.php

    r15281 r15473  
    132132    } else { 
    133133        echo '<div class="updated"><p>'; 
    134         _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.'); 
     134        _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.'); 
    135135        echo '</p></div>'; 
    136136 
  • trunk/wp-includes/media.php

    r15003 r15473  
    10641064        global $shortcode_tags; 
    10651065 
    1066         // Backup current registered shortcodes and clear them all out 
     1066        // Back up current registered shortcodes and clear them all out 
    10671067        $orig_shortcode_tags = $shortcode_tags; 
    10681068        remove_all_shortcodes(); 
  • trunk/wp-includes/ms-functions.php

    r15404 r15473  
    285285        return __( 'Error: Site URL already taken.' ); 
    286286 
    287     // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. 
     287    // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. 
    288288    // Need to get blog_id from wp_blogs, and create new table names. 
    289289    // Must restore table names at the end of function. 
Note: See TracChangeset for help on using the changeset viewer.