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

Links: Rename the `$link_id` parameter in `get_link_to_edit()` to `$link` to better reflect that it can accept a link ID or object. 

Props tloureiro for the initial patch.
Fixes #36736.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-05-02 23:43:27 +00:00
parent 4113ccfc47
commit ebfc1467bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/bookmark.php
View File

@ -131,11 +131,11 @@ function wp_get_link_cats( $link_id = 0 ) {
* *
* @since 2.0.0 * @since 2.0.0
* *
* @param int|stdClass $link_id Link ID or object to retrieve. * @param int|stdClass $link Link ID or object to retrieve.
* @return object Link object for editing. * @return object Link object for editing.
*/ */
function get_link_to_edit( $link_id ) { function get_link_to_edit( $link ) {
return get_bookmark( $link_id, OBJECT, 'edit' ); return get_bookmark( $link, OBJECT, 'edit' );
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37352'; $wp_version = '4.6-alpha-37353';
/** /**
* 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.