Changeset 18966

Timestamp:

10/13/2011 06:55:40 PM (13 years ago)

Author:

ryan

Message:

Avoid notices when viewing non-existent taxonomy. Props ocean90, johnbillion. fixes #18716

File:

• trunk/wp-admin/edit-tags.php (modified) (1 diff)

trunk/wp-admin/edit-tags.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
-$tax = get_taxonomy( $taxnow );
-if ( !current_user_can( $tax->cap->manage_terms ) )
+
+if ( ! isset( $_GET['taxonomy'] ) )
+    $taxonomy = 'post_tag';
+elseif ( in_array( $_GET['taxonomy'], get_taxonomies( array('show_ui' => true ) ) ) )
+    $taxonomy = sanitize_key( $_GET['taxonomy'] );
+else
+    wp_die( __( 'Invalid taxonomy' ) );
+
+$_GET['taxonomy'] = $taxonomy;
+
+$tax = get_taxonomy( $taxonomy );
+
+if ( ! $tax )
+    wp_die( __( 'Invalid taxonomy' ) );
+
+if ( ! current_user_can( $tax->cap->manage_terms ) )
     wp_die( __( 'Cheatin’ uh?' ) );