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

In `bookmark.php`, clarify some `return` docs. 

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-21 20:13:25 +00:00
parent 04554bc30d
commit e4c19c591f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/bookmark.php
View File

@ -16,7 +16,7 @@
* @param int|stdClass $bookmark * @param int|stdClass $bookmark
* @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
* @param string $filter Optional, default is 'raw'. * @param string $filter Optional, default is 'raw'.
* @return array|object Type returned depends on $output value. * @return array|object|null Type returned depends on $output value.
*/ */
function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') { function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
global $wpdb; global $wpdb;
@ -65,7 +65,7 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
* @param string $field The name of the data field to return * @param string $field The name of the data field to return
* @param int $bookmark The bookmark ID to get field * @param int $bookmark The bookmark ID to get field
* @param string $context Optional. The context of how the field will be used. * @param string $context Optional. The context of how the field will be used.
* @return string * @return string|WP_Error
*/ */
function get_bookmark_field( $field, $bookmark, $context = 'display' ) { function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
$bookmark = (int) $bookmark; $bookmark = (int) $bookmark;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32526'; $wp_version = '4.3-alpha-32527';
/** /**
* 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.