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

Use the correct hash notation syntax for the `WP_Filesystem_Base::dirlist()` DocBlock. 

See #28298.

Built from https://develop.svn.wordpress.org/trunk@30722


git-svn-id: http://core.svn.wordpress.org/trunk@30712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-12-03 10:11:22 +00:00
parent 3d77f9a816
commit 8df7115760
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-admin/includes/class-wp-filesystem-base.php
View File

@ -787,6 +787,7 @@ class WP_Filesystem_Base {
* *
* @since 2.5.0 * @since 2.5.0
* @abstract * @abstract
*
* @param string $path Path to directory or file. * @param string $path Path to directory or file.
* @param bool $include_hidden Optional. Whether to include details of hidden ("." prefixed) files. * @param bool $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
* Default true. * Default true.
@ -795,16 +796,16 @@ class WP_Filesystem_Base {
* @return array|bool { * @return array|bool {
* Array of files. False if unable to list directory contents. * Array of files. False if unable to list directory contents.
* *
* @type string 'name' Name of the file/directory. * @type string $name Name of the file/directory.
* @type string 'perms' *nix representation of permissions. * @type string $perms *nix representation of permissions.
* @type int 'permsn' Octal representation of permissions. * @type int $permsn Octal representation of permissions.
* @type string 'owner' Owner name or ID. * @type string $owner Owner name or ID.
* @type int 'size' Size of file in bytes. * @type int $size Size of file in bytes.
* @type int 'lastmodunix' Last modified unix timestamp. * @type int $lastmodunix Last modified unix timestamp.
* @type mixed 'lastmod' Last modified month (3 letter) and day (without leading 0). * @type mixed $lastmod Last modified month (3 letter) and day (without leading 0).
* @type int 'time' Last modified time. * @type int $time Last modified time.
* @type string 'type' Type of resource. 'f' for file, 'd' for directory. * @type string $type Type of resource. 'f' for file, 'd' for directory.
* @type mixed 'files' If a directory and $recursive is true, contains another array of files. * @type mixed $files If a directory and $recursive is true, contains another array of files.
* } * }
*/ */
public function dirlist( $path, $include_hidden = true, $recursive = false ) { public function dirlist( $path, $include_hidden = true, $recursive = false ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30721'; $wp_version = '4.1-beta2-30722';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.