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

Fix a PHPDoc typo for `wp_json_encode()`. 

Props JustinSainton.

See #28786.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2014-10-28 18:54:18 +00:00
parent c4b889b1fa
commit 3495fa40df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/functions.php
View File

@ -2619,7 +2619,7 @@ function _scalar_wp_die_handler( $message = '' ) {
* *
* @param mixed $data Variable (usually an array or object) to encode as JSON * @param mixed $data Variable (usually an array or object) to encode as JSON
* @param int $options Options to be passed to json_encode(). Default 0. * @param int $options Options to be passed to json_encode(). Default 0.
* @param int $depth Maximum depth to walk through $data. Must be greater than 0, default 512.t * @param int $depth Maximum depth to walk through $data. Must be greater than 0, default 512.
* *
* @return bool|string The JSON encoded string, or false if it cannot be encoded * @return bool|string The JSON encoded string, or false if it cannot be encoded
*/ */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30057'; $wp_version = '4.1-alpha-30058';
/** /**
* 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.