Fix typos and inconsistencies in PHPdoc / function declarations. See #17414 props duck_

git-svn-id: http://svn.automattic.com/wordpress/trunk@17925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2011-05-14 09:50:20 +00:00
parent c379a72852
commit 65e341d0cb
4 changed files with 11 additions and 11 deletions

View File

@ -59,7 +59,7 @@ if ( $action ) {
update_option('recently_activated', $recent); update_option('recently_activated', $recent);
} }
if ( isset($_GET['from']) && 'import' == $_GET['from'] ) { if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
} else { } else {
wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
} }

View File

@ -192,7 +192,7 @@ class WP_Http {
} }
/** /**
* Tests which transports are capabable of supporting the request. * Tests which transports are capable of supporting the request.
* *
* @since 3.2.0 * @since 3.2.0
* @access private * @access private
@ -247,7 +247,7 @@ class WP_Http {
if ( !$class ) if ( !$class )
return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) ); return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
// Transport claims to support request, Instantate it and give it a whirl. // Transport claims to support request, instantiate it and give it a whirl.
if ( empty( $transports[$class] ) ) if ( empty( $transports[$class] ) )
$transports[$class] = new $class; $transports[$class] = new $class;

View File

@ -1227,7 +1227,7 @@ function addslashes_gpc($gpc) {
* *
* @since 2.0.0 * @since 2.0.0
* *
* @param array|string $value The array or string to be striped. * @param array|string $value The array or string to be stripped.
* @return array|string Stripped array (or string in the callback). * @return array|string Stripped array (or string in the callback).
*/ */
function stripslashes_deep($value) { function stripslashes_deep($value) {
@ -2748,7 +2748,7 @@ function _links_add_base($m) {
* This function by default only applies to <a> tags, however this can be * This function by default only applies to <a> tags, however this can be
* modified by the 3rd param. * modified by the 3rd param.
* *
* <b>NOTE:</b> Any current target attributed will be striped and replaced. * <b>NOTE:</b> Any current target attributed will be stripped and replaced.
* *
* @since 2.7.0 * @since 2.7.0
* *

View File

@ -186,8 +186,8 @@ function esc_html_e( $text, $domain = 'default' ) {
* @param string $domain Optional. Domain to retrieve the translated text * @param string $domain Optional. Domain to retrieve the translated text
* @return string Translated context string without pipe * @return string Translated context string without pipe
*/ */
function _x( $single, $context, $domain = 'default' ) { function _x( $text, $context, $domain = 'default' ) {
return translate_with_gettext_context( $single, $context, $domain ); return translate_with_gettext_context( $text, $context, $domain );
} }
/** /**
@ -201,8 +201,8 @@ function _x( $single, $context, $domain = 'default' ) {
* @param string $domain Optional. Domain to retrieve the translated text * @param string $domain Optional. Domain to retrieve the translated text
* @return string Translated context string without pipe * @return string Translated context string without pipe
*/ */
function _ex( $single, $context, $domain = 'default' ) { function _ex( $text, $context, $domain = 'default' ) {
echo _x( $single, $context, $domain ); echo _x( $text, $context, $domain );
} }
function esc_attr_x( $single, $context, $domain = 'default' ) { function esc_attr_x( $single, $context, $domain = 'default' ) {
@ -270,9 +270,9 @@ function _nx($single, $plural, $number, $context, $domain = 'default') {
* $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count ); * $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count );
* *
* @since 2.5 * @since 2.5
* @param string $single Single form to be i18ned * @param string $singular Single form to be i18ned
* @param string $plural Plural form to be i18ned * @param string $plural Plural form to be i18ned
* @return array array($single, $plural) * @return array array($singular, $plural)
*/ */
function _n_noop( $singular, $plural ) { function _n_noop( $singular, $plural ) {
return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null ); return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null );