diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 1dfca20573..d4ac77bb58 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -868,16 +868,24 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own /** * Determines which Filesystem Method to use. - * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsockopen()) + * + * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, + * FTP Sockets (Via Sockets class, or `fsockopen()`). * * Note that the return value of this function can be overridden in 2 ways - * - By defining FS_METHOD in your wp-config.php file + * + * - By defining FS_METHOD in your `wp-config.php` file * - By using the filesystem_method filter - * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets' - * Plugins may also define a custom transport handler, See the WP_Filesystem function for more information. + * + * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets'. + * + * Plugins may also define a custom transport handler, See the WP_Filesystem + * function for more information. * * @since 2.5.0 * + * @todo Properly mark arguments as optional. + * * @param array $args Connection details. * @param string $context Full path to the directory that is tested for being writable. * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable. @@ -943,14 +951,20 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe } /** - * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem. + * Displays a form to the user to request for their FTP/SSH details in order + * to connect to the filesystem. + * * All chosen/entered details are saved, Excluding the Password. * - * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port. + * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) + * to specify an alternate FTP/SSH port. * - * Plugins may override this form by returning true|false via the request_filesystem_credentials filter. + * Plugins may override this form by returning true|false via the + * {@see 'request_filesystem_credentials'} filter. * - * @since 2.5.0 + * @since 2.5. + * + * @todo Properly mark optional arguments as such * * @param string $form_post the URL to post the form to * @param string $type the chosen Filesystem method in use diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 40db646f1a..67a2095c20 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -2137,7 +2137,7 @@ function wp_list_comments( $args = array(), $comments = null ) { * } * @type string $comment_field The comment textarea field HTML. * @type string $must_log_in HTML element for a 'must be logged in to comment' message. - * @type string $logged_in_as HTML element for a 'logged in as ' message. + * @type string $logged_in_as HTML element for a 'logged in as [user]' message. * @type string $comment_notes_before HTML element for a message displayed before the comment form. * Default 'Your email address will not be published.'. * @type string $comment_notes_after HTML element for a message displayed after the comment form. @@ -2246,7 +2246,7 @@ function comment_form( $args = array(), $post_id = null ) {
> tag. + * Fires at the top of the comment form, inside the form tag. * * @since 3.0.0 */ diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index da73b40845..de063c9e00 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -451,12 +451,10 @@ function wp_get_linksbyname($category, $args = '') { /** * Gets an array of link objects associated with category $cat_name. * - * - * $links = get_linkobjectsbyname('fred'); - * foreach ($links as $link) { - * echo '
  • '.$link->link_name.'
    • '; - * } - *     + * $links = get_linkobjectsbyname( 'fred' ); + * foreach ( $links as $link ) { + * echo '
  • ' . $link->link_name . '
    • '; + * } * * @since 1.0.1 * @deprecated 2.1.0 @@ -485,31 +483,29 @@ function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit * Gets an array of link objects associated with category n. * * Usage: - * - * $links = get_linkobjects(1); - * if ($links) { - * foreach ($links as $link) { - * echo '
  • '.$link->link_name.'
    '.$link->link_description.'
    • '; - * } - * } - *     + * + * $links = get_linkobjects(1); + * if ($links) { + * foreach ($links as $link) { + * echo '
  • '.$link->link_name.'
    '.$link->link_description.'
    • '; + * } + * } * * Fields are: - *
      - *
    1. link_id
      2. - *
    2. link_url
      3. - *
    3. link_name
      4. - *
    4. link_image
      5. - *
    5. link_target
      6. - *
    6. link_category
      7. - *
    7. link_description
      8. - *
    8. link_visible
      9. - *
    9. link_owner
      10. - *
    10. link_rating
      11. - *
    11. link_updated
      12. - *
    12. link_rel
      13. - *
    13. link_notes
      14. - *
    + * + * - link_id + * - link_url + * - link_name + * - link_image + * - link_target + * - link_category + * - link_description + * - link_visible + * - link_owner + * - link_rating + * - link_updated + * - link_rel + * - link_notes * * @since 1.0.1 * @deprecated 2.1.0 @@ -2989,7 +2985,7 @@ function get_current_theme() { /** * Accepts matches array from preg_replace_callback in wpautop() or a string. * - * Ensures that the contents of a <
    >...<
    > HTML block are not + * Ensures that the contents of a `
    ...
    ` HTML block are not * converted into paragraphs or line-breaks. * * @since 1.2.0 diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php index f7da5f2a9a..3c91e74f49 100644 --- a/wp-includes/feed-rss2.php +++ b/wp-includes/feed-rss2.php @@ -11,7 +11,7 @@ $more = 1; echo ''; /** - * Fires between the and tags in a feed. + * Fires between the xml and rss tags in a feed. * * @since 4.0.0 * diff --git a/wp-includes/version.php b/wp-includes/version.php index 597ab24b75..b8e3276154 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30537'; +$wp_version = '4.1-beta2-30538'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.