sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make $taxonomy parameter optional in get_edit_term_link().

Browse Source 
Props nicdford, sc0ttkclark.
Fixes #35922.

git-svn-id: https://develop.svn.wordpress.org/trunk@36646 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2016-02-23 20:06:25 +00:00
parent 773151a9bf
commit 193196a552
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wp-includes/link-template.php
View File

@ -907,21 +907,22 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
* Retrieve edit term url. * Retrieve edit term url.
* *
* @since 3.1.0 * @since 3.1.0
* @since 4.5.0 The `$taxonomy` argument was made optional.
* *
* @param int $term_id Term ID. * @param int $term_id Term ID.
* @param string $taxonomy Taxonomy. * @param string $taxonomy Optional. Taxonomy. Defaults to the taxonomy of the term identified by `$term_id`.
* @param string $object_type The object type. Used to highlight the proper post type menu on the linked page. * @param string $object_type Optional. The object type. Used to highlight the proper post type menu on the linked page.
* Defaults to the first object_type associated with the taxonomy. * Defaults to the first object_type associated with the taxonomy.
* @return string|null The edit term link URL for the given term, or null on failure. * @return string|null The edit term link URL for the given term, or null on failure.
*/ */
function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) { function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
$tax = get_taxonomy( $taxonomy ); $term = get_term( $term_id, $taxonomy );
if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) { if ( ! $term || is_wp_error( $term ) ) {
return; return;
} }
$term = get_term( $term_id, $taxonomy ); $tax = get_taxonomy( $term->taxonomy );
if ( ! $term || is_wp_error( $term ) ) { if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
return; return;
} }

33
tests/phpunit/tests/term/getEditTermLink.php
View File

@ -50,5 +50,38 @@ class Tests_Term_GetEditTermLink extends WP_UnitTestCase {
$this->assertNull( $actual ); $this->assertNull( $actual );
} }
/**
* @ticket 35922
*/
public function test_taxonomy_should_not_be_required() {
$t = self::factory()->term->create( array(
'taxonomy' => 'wptests_tax',
'name' => 'foo',
) );
$actual = get_edit_term_link( $t );
$this->assertNotNull( $actual );
}
/**
* @ticket 35922
*/
public function test_cap_check_should_use_correct_taxonomy_when_taxonomy_is_not_specified() {
register_taxonomy( 'wptests_tax_subscriber', 'post', array(
'manage_terms' => 'read',
) );
$t = self::factory()->term->create( array(
'taxonomy' => 'wptests_tax',
'name' => 'foo',
) );
$u = self::factory()->user->create( array(
'role' => 'subscriber',
) );
wp_set_current_user( $u );
$actual = get_edit_term_link( $t );
$this->assertNull( $actual );
}
} }