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

Improve error checking in `get_edit_term_link()`. 

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

Props tmatsuur, MikeHansenMe.
Fixes #32786.
Built from https://develop.svn.wordpress.org/trunk@32954


git-svn-id: http://core.svn.wordpress.org/trunk@32925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-06-26 14:13:24 +00:00
parent 40ab4567e7
commit d99f9d3a22
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 $taxonomy Taxonomy.
* @param string $object_type The object type. Used to highlight the proper post type menu on the linked page. * @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. * 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 = '' ) { function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) {
$tax = get_taxonomy( $taxonomy ); $tax = get_taxonomy( $taxonomy );
if ( !current_user_can( $tax->cap->edit_terms ) ) if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
return; return;
}
$term = get_term( $term_id, $taxonomy ); $term = get_term( $term_id, $taxonomy );
if ( ! $term || is_wp_error( $term ) ) {
return;
}
$args = array( $args = array(
'action' => 'edit', 'action' => 'edit',

2
wp-includes/version.php
View File

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