mirror of
https://github.com/WordPress/WordPress.git
synced 2025-01-03 15:08:10 +01:00
Fix some @param
docs that have chars too close them.
Add `@property` annotations to `WP_User` and `WP_Post`. Remove erroneous `@param`s from image editor class methods. Officially add the property `$_column_headers` to `WP_List_Table`. See #30799. Built from https://develop.svn.wordpress.org/trunk@31127 git-svn-id: http://core.svn.wordpress.org/trunk@31108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
0a511680f4
commit
5547115dc2
@ -73,6 +73,13 @@ class WP_List_Table {
|
|||||||
*/
|
*/
|
||||||
protected $modes = array();
|
protected $modes = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stores the value returned by ->get_column_info()
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
protected $_column_headers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -415,6 +415,17 @@ class WP_Role {
|
|||||||
* @since 2.0.0
|
* @since 2.0.0
|
||||||
* @package WordPress
|
* @package WordPress
|
||||||
* @subpackage User
|
* @subpackage User
|
||||||
|
*
|
||||||
|
* @property string $display_name
|
||||||
|
* @property string $nickname
|
||||||
|
* @property string $user_description
|
||||||
|
* @property string $user_email
|
||||||
|
* @property string $user_firstname
|
||||||
|
* @property string $user_lastname
|
||||||
|
* @property string $user_nicename
|
||||||
|
* @property string $user_pass
|
||||||
|
* @property string $user_registered
|
||||||
|
* @property string $user_url
|
||||||
*/
|
*/
|
||||||
class WP_User {
|
class WP_User {
|
||||||
/**
|
/**
|
||||||
@ -492,7 +503,6 @@ class WP_User {
|
|||||||
* @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
|
* @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
|
||||||
* @param string $name Optional. User's username
|
* @param string $name Optional. User's username
|
||||||
* @param int $blog_id Optional Blog ID, defaults to current blog.
|
* @param int $blog_id Optional Blog ID, defaults to current blog.
|
||||||
* @return WP_User
|
|
||||||
*/
|
*/
|
||||||
public function __construct( $id = 0, $name = '', $blog_id = '' ) {
|
public function __construct( $id = 0, $name = '', $blog_id = '' ) {
|
||||||
if ( ! isset( self::$back_compat_keys ) ) {
|
if ( ! isset( self::$back_compat_keys ) ) {
|
||||||
|
@ -329,7 +329,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
|
|||||||
* @since 3.5.0
|
* @since 3.5.0
|
||||||
* @access public
|
* @access public
|
||||||
*
|
*
|
||||||
* @param string|int $src The source file or Attachment ID.
|
|
||||||
* @param int $src_x The start x position to crop from.
|
* @param int $src_x The start x position to crop from.
|
||||||
* @param int $src_y The start y position to crop from.
|
* @param int $src_y The start y position to crop from.
|
||||||
* @param int $src_w The width to crop.
|
* @param int $src_w The width to crop.
|
||||||
|
@ -125,7 +125,6 @@ abstract class WP_Image_Editor {
|
|||||||
* @access public
|
* @access public
|
||||||
* @abstract
|
* @abstract
|
||||||
*
|
*
|
||||||
* @param string|int $src The source file or Attachment ID.
|
|
||||||
* @param int $src_x The start x position to crop from.
|
* @param int $src_x The start x position to crop from.
|
||||||
* @param int $src_y The start y position to crop from.
|
* @param int $src_y The start y position to crop from.
|
||||||
* @param int $src_w The width to crop.
|
* @param int $src_w The width to crop.
|
||||||
|
@ -3522,7 +3522,7 @@ function wp_pre_kses_less_than_callback( $matches ) {
|
|||||||
* @link http://www.php.net/sprintf
|
* @link http://www.php.net/sprintf
|
||||||
*
|
*
|
||||||
* @param string $pattern The string which formatted args are inserted.
|
* @param string $pattern The string which formatted args are inserted.
|
||||||
* @param mixed $args,... Arguments to be formatted into the $pattern string.
|
* @param mixed $args ,... Arguments to be formatted into the $pattern string.
|
||||||
* @return string The formatted string.
|
* @return string The formatted string.
|
||||||
*/
|
*/
|
||||||
function wp_sprintf( $pattern ) {
|
function wp_sprintf( $pattern ) {
|
||||||
|
@ -455,6 +455,11 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
|
|||||||
*
|
*
|
||||||
* @since 3.5.0
|
* @since 3.5.0
|
||||||
*
|
*
|
||||||
|
* @property-read array $ancestors
|
||||||
|
* @property-read string $page_template
|
||||||
|
* @property-read int $post_category
|
||||||
|
* @property-read string $tag_input
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
final class WP_Post {
|
final class WP_Post {
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.2-alpha-31126';
|
$wp_version = '4.2-alpha-31127';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
Loading…
Reference in New Issue
Block a user