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

Improve error checking in get_edit_term_link().

Browse Source 
The function should not throw notices when an improper term or taxonomy is
passed.

Props tmatsuur, MikeHansenMe.
Fixes #32786.

git-svn-id: https://develop.svn.wordpress.org/trunk@32954 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-06-26 14:12:27 +00:00
parent da5c716009
commit 4f60683623
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,14 +903,18 @@ function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
* @param string $taxonomy Taxonomy.
* @param string $object_type 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.
* @return string The edit term link URL for the given term.
* @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 = '' ) {
$tax = get_taxonomy( $taxonomy );
if ( !current_user_can( $tax->cap->edit_terms ) )
if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
return;
}
$term = get_term( $term_id, $taxonomy );
if ( ! $term || is_wp_error( $term ) ) {
return;
}
$args = array(
'action' => 'edit',

54
tests/phpunit/tests/term/getEditTermLink.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
* @group taxonomy
*/
class Tests_Term_GetEditTermLink extends WP_UnitTestCase {
public function setUp() {
parent::setUp();
wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
register_taxonomy( 'wptests_tax', 'post' );
}
public function test_get_edit_term_link_default() {
$term1 = $this->factory->term->create( array(
'taxonomy' => 'wptests_tax',
'name' => 'foo',
) );
$actual = get_edit_term_link( $term1, 'wptests_tax' );
$expected = 'http://example.org/wp-admin/edit-tags.php?action=edit&taxonomy=wptests_tax&tag_ID=' . $term1 . '&post_type=post';
$this->assertEquals( $expected, $actual );
}
/**
* @ticket 32786
*/
public function test_get_edit_term_link_invalid_id() {
$term1 = $this->factory->term->create( array(
'taxonomy' => 'wptests_tax',
'name' => 'foo',
) );
$actual = get_edit_term_link( 12345, 'wptests_tax' );
$this->assertNull( $actual );
}
/**
* @ticket 32786
*/
public function test_get_edit_term_link_empty_id() {
$actual = get_edit_term_link( '', 'wptests_tax' );
$this->assertNull( $actual );
}
/**
* @ticket 32786
*/
public function test_get_edit_term_link_bad_tax() {
$actual = get_edit_term_link( '', 'bad_tax' );
$this->assertNull( $actual );
}
}