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

4.1 Docs Audit: Improve inline documentation for various properties and methods in the `WP_Customize_Control` and `WP_Customize_Upload_Control` classes. 

See #30469.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-11-28 09:20:23 +00:00
parent 9dcb6daec2
commit 3bbf79ba92
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/class-wp-customize-control.php
View File

@ -256,7 +256,7 @@ class WP_Customize_Control {
*
* @since 4.1.0
*
* @return array
* @return array Array of parameters passed to the JavaScript.
*/
public function json() {
$this->to_json();
@ -288,7 +288,7 @@ class WP_Customize_Control {
*
* @since 4.1.0
*
* @return string
* @return string Contents of the control.
*/
public final function get_content() {
ob_start();
@ -506,9 +506,11 @@ class WP_Customize_Control {
/**
* Render the control's JS template.
*
* This function is only run for control types that have been registered with {@see WP_Customize_Manager::register_control_type()}.
* This function is only run for control types that have been registered with
* {@see WP_Customize_Manager::register_control_type()}.
*
* In the future, this will also print the template for the control's container element and be overridable.
* In the future, this will also print the template for the control's container
* element and be override-able.
*
* @since 4.1.0
*/
@ -648,9 +650,8 @@ class WP_Customize_Upload_Control extends WP_Customize_Control {
* Constructor.
*
* @since 4.1.0
* @uses WP_Customize_Control::__construct()
*
* @param WP_Customize_Manager $manager
* @param WP_Customize_Manager $manager {@see WP_Customize_Manager} instance.
*/
public function __construct( $manager, $id, $args = array() ) {
parent::__construct( $manager, $id, $args );

2
wp-includes/version.php
View File

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