Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More pedantry. "Setup" is not a verb. http://notaverb.com/setup 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-03-17 04:39:50 +00:00
parent fb2328191e
commit 58d47426cc
19 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/custom-background.php
View File

@ -47,7 +47,7 @@ class Custom_Background {
}
/**
* Setup the hooks for the Custom Background admin page.
* Set up the hooks for the Custom Background admin page.
*
* @since unknown
*/
@ -84,7 +84,7 @@ class Custom_Background {
}
/**
* Setup the enqueue for the JavaScript files.
* Set up the enqueue for the JavaScript files.
*
* @since unknown
*/
@ -96,7 +96,7 @@ class Custom_Background {
}
/**
* Setup the enqueue for the CSS files
* Set up the enqueue for the CSS files
*
* @since unknown
*/

6
wp-admin/custom-header.php
View File

@ -49,7 +49,7 @@ class Custom_Image_Header {
}
/**
* Setup the hooks for the Custom Header admin page.
* Set up the hooks for the Custom Header admin page.
*
* @since unknown
*/
@ -85,7 +85,7 @@ class Custom_Image_Header {
}
/**
* Setup the enqueue for the JavaScript files.
* Set up the enqueue for the JavaScript files.
*
* @since unknown
*/
@ -99,7 +99,7 @@ class Custom_Image_Header {
}
/**
* Setup the enqueue for the CSS files
* Set up the enqueue for the CSS files
*
* @since 2.7
*/

4
wp-admin/includes/nav-menu.php
View File

@ -313,7 +313,7 @@ function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $cont
$menu_item->post_parent = 0;
if ( 0 == $menu_item->post_parent ) {
// Setup the menu item
// Set up the menu item
$menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
$attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
@ -371,7 +371,7 @@ function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $con
if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
$output .= '<ul class="sub-menu menu-item-type-'. $object_type .'">';
foreach ( $sub_menu_items as $menu_item ) {
// Setup the menu item
// Set up the menu item
$menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
$attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';

4
wp-cron.php
View File

@ -1,7 +1,7 @@
<?php
/**
* WordPress Cron Implementation for hosts, which do not offer CRON or for which
* the user has not setup a CRON job pointing to this file.
* the user has not set up a CRON job pointing to this file.
*
* The HTTP request to this file will not slow down the visitor who happens to
* visit when the cron job is needed to run.
@ -22,7 +22,7 @@ if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
define('DOING_CRON', true);
if ( !defined('ABSPATH') ) {
/** Setup WordPress environment */
/** Set up WordPress environment */
require_once('./wp-load.php');
}

6
wp-includes/capabilities.php
View File

@ -85,7 +85,7 @@ class WP_Roles {
}
/**
* Setup the object properties.
* Set up the object properties.
*
* The role key is set to the current prefix for the $wpdb object with
* 'user_roles' appended. If the $wp_user_roles global is set, then it will
@ -269,7 +269,7 @@ class WP_Role {
var $capabilities;
/**
* PHP4 Constructor - Setup object properties.
* PHP4 Constructor - Set up object properties.
*
* The list of capabilities, must have the key as the name of the capability
* and the value a boolean of whether it is granted to the role.
@ -500,7 +500,7 @@ class WP_User {
}
/**
* Setup capability object properties.
* Set up capability object properties.
*
* Will set the value for the 'cap_key' property to current database table
* prefix, followed by 'capabilities'. Will then check to see if the

6
wp-includes/class-http.php
View File

@ -50,12 +50,12 @@ class WP_Http {
}
/**
* PHP5 style Constructor - Setup available transport if not available.
* PHP5 style Constructor - Set up available transport if not available.
*
* PHP4 does not have the 'self' keyword and since WordPress supports PHP4,
* the class needs to be used for the static call.
*
* The transport are setup to save time. This should only be called once, so
* The transport are set up to save time. This should only be called once, so
* the overhead should be fine.
*
* @since 2.7.0
@ -650,7 +650,7 @@ class WP_Http_Fsockopen {
}
//fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,
// which fails when the server is not setup for it. For compatibility, always connect to the IPv4 address.
// which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.
if ( 'localhost' == strtolower($fsockopen_host) )
$fsockopen_host = '127.0.0.1';

6
wp-includes/classes.php
View File

@ -409,7 +409,7 @@ class WP {
}
/**
* Setup the WordPress Globals.
* Set up the WordPress Globals.
*
* The query_vars property will be extracted to the GLOBALS. So care should
* be taken when naming global variables that might interfere with the
@ -440,7 +440,7 @@ class WP {
}
/**
* Setup the current user.
* Set up the current user.
*
* @since 2.0.0
*/
@ -449,7 +449,7 @@ class WP {
}
/**
* Setup the Loop based on the query variables.
* Set up the Loop based on the query variables.
*
* @uses WP::$query_vars
* @since 2.0.0

2
wp-includes/formatting.php
View File

@ -34,7 +34,7 @@ function wptexturize($text) {
$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
$stop = count($textarr);
// No need to setup these variables more than once
// No need to set up these variables more than once
if (!$static_setup) {
/* translators: opening curly quote */
$opening_quote = _x('&#8220;', 'opening curly quote');

2
wp-includes/functions.php
View File

@ -1475,7 +1475,7 @@ function wp_remote_fopen( $uri ) {
}
/**
* Setup the WordPress query.
* Set up the WordPress query.
*
* @since 2.0.0
*

2
wp-includes/ms-settings.php
View File

@ -1,6 +1,6 @@
<?php
/**
* Used to setup and fix common variables and include
* Used to set up and fix common variables and include
* the Multisite procedural and class library.
*
* Allows for some configuration in wp-config.php (see ms-default-constants.php)

2
wp-includes/nav-menu-template.php
View File

@ -113,7 +113,7 @@ function wp_get_nav_menu( $args = array() ) {
}
foreach ( $menu_items as $key => $menu_item ) {
// Setup the $menu_item variables
// Set up the $menu_item variables
$menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
$type = $menu_item->append;

10
wp-includes/query.php
View File

@ -45,7 +45,7 @@ function set_query_var($var, $value) {
}
/**
* Setup The Loop with query parameters.
* Set up The Loop with query parameters.
*
* This will override the current WordPress Loop and shouldn't be used more than
* once. This must not be used within the WordPress Loop.
@ -63,11 +63,11 @@ function &query_posts($query) {
}
/**
* Destroy the previous query and setup a new query.
* Destroy the previous query and set up a new query.
*
* This should be used after {@link query_posts()} and before another {@link
* query_posts()}. This will remove obscure bugs that occur when the previous
* wp_query object is not destroyed properly before another is setup.
* wp_query object is not destroyed properly before another is set up.
*
* @since 2.3.0
* @uses $wp_query
@ -2466,7 +2466,7 @@ class WP_Query {
}
/**
* Setup the next post and iterate current post index.
* Set up the next post and iterate current post index.
*
* @since 1.5.0
* @access public
@ -2760,7 +2760,7 @@ function wp_old_slug_redirect () {
}
/**
* Setup global post data.
* Set up global post data.
*
* @since 1.5.0
*

2
wp-includes/registration.php
View File

@ -314,7 +314,7 @@ function wp_create_user($username, $password, $email = '') {
/**
* Setup the default contact methods
* Set up the default contact methods
*
* @access private
* @since

6
wp-includes/rss.php
View File

@ -67,7 +67,7 @@ class MagpieRSS {
$this->parser = $parser;
# pass in parser, and a reference to this object
# setup handlers
# set up handlers
#
xml_set_object( $this->parser, $this );
xml_set_element_handler($this->parser,
@ -461,7 +461,7 @@ function fetch_rss ($url) {
// else attempt a conditional get
// setup headers
// set up headers
if ( $cache_status == 'STALE' ) {
$rss = $cache->get( $url );
if ( isset($rss->etag) and $rss->last_modified ) {
@ -611,7 +611,7 @@ function _response_to_rss ($resp) {
}
/**
* Setup constants with default values, unless user overrides.
* Set up constants with default values, unless user overrides.
*
* @since unknown
* @package External

2
wp-includes/script-loader.php
View File

@ -37,7 +37,7 @@ require( ABSPATH . WPINC . '/class.wp-styles.php' );
require( ABSPATH . WPINC . '/functions.wp-styles.php' );
/**
* Setup WordPress scripts to load by default for Administration Panels.
* Set up WordPress scripts to load by default for Administration Panels.
*
* Localizes a few of the scripts.
* $scripts->add_data( 'script-handle', 'group', 1 ); queues the script for the footer

4
wp-includes/user.php
View File

@ -476,7 +476,7 @@ function count_users($strategy = 'time') {
//
/**
* Setup global user vars.
* Set up global user vars.
*
* Used by set_current_user() for back compat. Might be deprecated in the
* future.
@ -491,7 +491,7 @@ function count_users($strategy = 'time') {
* @global string $user_pass_md5 MD5 of the user's password
* @global string $user_identity The display name of the user
*
* @param int $for_user_id Optional. User ID to setup global data.
* @param int $for_user_id Optional. User ID to set up global data.
*/
function setup_userdata($for_user_id = '') {
global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;

2
wp-includes/wp-db.php
View File

@ -735,7 +735,7 @@ class wpdb {
<li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
<li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
</ul>
<p>If you don\'t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' );
<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' );
return;
}
}

2
wp-settings.php
View File

@ -1,6 +1,6 @@
<?php
/**
* Used to setup and fix common variables and include
* Used to set up and fix common variables and include
* the WordPress procedural and class library.
*
* Allows for some configuration in wp-config.php (see default-constants.php)

2
xmlrpc.php
View File

@ -369,7 +369,7 @@ class wp_xmlrpc_server extends IXR_Server {
}
/**
* Setup blog options property.
* Set up blog options property.
*
* Passes property through 'xmlrpc_blog_options' filter.
*