![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changes from trunk/wp-admin/edit-tags.php at r17435 to branches/3.0/wp-admin/edit-tags.php at r15442
- File:
-
- 1 edited
-
branches/3.0/wp-admin/edit-tags.php (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/wp-admin/edit-tags.php
r17435 r15442 9 9 /** WordPress Administration Bootstrap */ 10 10 require_once('./admin.php'); 11 $tax = get_taxonomy( $taxnow ); 12 if ( !current_user_can( $tax->cap->manage_terms ) ) 13 wp_die( __( 'Cheatin’ uh?' ) ); 14 15 $wp_list_table = _get_list_table('WP_Terms_List_Table'); 16 $pagenum = $wp_list_table->get_pagenum(); 11 12 wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') ); 13 14 if ( empty($taxonomy) ) 15 $taxonomy = 'post_tag'; 16 17 if ( !taxonomy_exists($taxonomy) ) 18 wp_die(__('Invalid taxonomy')); 19 20 $tax = get_taxonomy($taxonomy); 21 22 if ( ! current_user_can($tax->cap->manage_terms) ) 23 wp_die(__('Cheatin’ uh?')); 17 24 18 25 $title = $tax->labels->name; 26 27 if ( empty($post_type) || !in_array( $post_type, get_post_types( array('public' => true) ) ) ) 28 $post_type = 'post'; 19 29 20 30 if ( 'post' != $post_type ) { 21 31 $parent_file = "edit.php?post_type=$post_type"; 22 32 $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type"; 23 } else if ( 'link_category' == $tax->name ) {24 $parent_file = 'link-manager.php';25 $submenu_file = 'edit-tags.php?taxonomy=link_category';26 33 } else { 27 34 $parent_file = 'edit.php'; … … 29 36 } 30 37 31 add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') ); 32 33 switch ( $wp_list_table->current_action() ) { 38 if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) 39 $action = 'bulk-delete'; 40 41 switch($action) { 34 42 35 43 case 'add-tag': 36 44 37 check_admin_referer( 'add-tag');38 39 if ( !current_user_can( $tax->cap->edit_terms) )40 wp_die( __( 'Cheatin’ uh?' ));41 42 $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST);45 check_admin_referer('add-tag'); 46 47 if ( !current_user_can($tax->cap->edit_terms) ) 48 wp_die(__('Cheatin’ uh?')); 49 50 $ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST); 43 51 $location = 'edit-tags.php?taxonomy=' . $taxonomy; 44 52 if ( 'post' != $post_type ) … … 46 54 47 55 if ( $referer = wp_get_original_referer() ) { 48 if ( false !== strpos( $referer, 'edit-tags.php') )56 if ( false !== strpos($referer, 'edit-tags.php') ) 49 57 $location = $referer; 50 58 } 51 59 52 60 if ( $ret && !is_wp_error( $ret ) ) 53 $location = add_query_arg( 'message', 1, $location);54 else 55 $location = add_query_arg( 'message', 4, $location);56 wp_redirect( $location);61 $location = add_query_arg('message', 1, $location); 62 else 63 $location = add_query_arg('message', 4, $location); 64 wp_redirect($location); 57 65 exit; 58 66 break; … … 63 71 $location .= '&post_type=' . $post_type; 64 72 if ( $referer = wp_get_referer() ) { 65 if ( false !== strpos( $referer, 'edit-tags.php') )73 if ( false !== strpos($referer, 'edit-tags.php') ) 66 74 $location = $referer; 67 75 } 68 76 69 if ( !isset( $_ REQUEST['tag_ID'] ) ) {70 wp_redirect( $location);77 if ( !isset( $_GET['tag_ID'] ) ) { 78 wp_redirect($location); 71 79 exit; 72 80 } 73 81 74 $tag_ID = (int) $_ REQUEST['tag_ID'];75 check_admin_referer( 'delete-tag_' . $tag_ID);76 77 if ( !current_user_can( $tax->cap->delete_terms) )78 wp_die( __( 'Cheatin’ uh?' ));79 80 wp_delete_term( $tag_ID, $taxonomy 81 82 $location = add_query_arg( 'message', 2, $location);83 wp_redirect( $location);82 $tag_ID = (int) $_GET['tag_ID']; 83 check_admin_referer('delete-tag_' . $tag_ID); 84 85 if ( !current_user_can($tax->cap->delete_terms) ) 86 wp_die(__('Cheatin’ uh?')); 87 88 wp_delete_term( $tag_ID, $taxonomy); 89 90 $location = add_query_arg('message', 2, $location); 91 wp_redirect($location); 84 92 exit; 85 93 … … 87 95 88 96 case 'bulk-delete': 89 check_admin_referer( 'bulk-tags');90 91 if ( !current_user_can( $tax->cap->delete_terms) )92 wp_die( __( 'Cheatin’ uh?' ));93 94 $tags = (array) $_ REQUEST['delete_tags'];95 foreach 96 wp_delete_term( $tag_ID, $taxonomy 97 check_admin_referer('bulk-tags'); 98 99 if ( !current_user_can($tax->cap->delete_terms) ) 100 wp_die(__('Cheatin’ uh?')); 101 102 $tags = (array) $_GET['delete_tags']; 103 foreach( $tags as $tag_ID ) { 104 wp_delete_term( $tag_ID, $taxonomy); 97 105 } 98 106 … … 101 109 $location .= '&post_type=' . $post_type; 102 110 if ( $referer = wp_get_referer() ) { 103 if ( false !== strpos( $referer, 'edit-tags.php') )111 if ( false !== strpos($referer, 'edit-tags.php') ) 104 112 $location = $referer; 105 113 } 106 114 107 $location = add_query_arg( 'message', 6, $location);108 wp_redirect( $location);115 $location = add_query_arg('message', 6, $location); 116 wp_redirect($location); 109 117 exit; 110 118 … … 114 122 $title = $tax->labels->edit_item; 115 123 116 require_once ( 'admin-header.php' ); 117 $tag_ID = (int) $_REQUEST['tag_ID']; 118 119 $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); 120 include( './edit-tag-form.php' ); 124 require_once ('admin-header.php'); 125 $tag_ID = (int) $_GET['tag_ID']; 126 127 if ( !current_user_can($tax->cap->edit_terms) ) 128 wp_die( __('You are not allowed to edit this item.') ); 129 130 $tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit'); 131 include('./edit-tag-form.php'); 121 132 122 133 break; … … 124 135 case 'editedtag': 125 136 $tag_ID = (int) $_POST['tag_ID']; 126 check_admin_referer( 'update-tag_' . $tag_ID);127 128 if ( !current_user_can( $tax->cap->edit_terms) )129 wp_die( __( 'Cheatin’ uh?' ));130 131 $ret = wp_update_term( $tag_ID, $taxonomy, $_POST);137 check_admin_referer('update-tag_' . $tag_ID); 138 139 if ( !current_user_can($tax->cap->edit_terms) ) 140 wp_die(__('Cheatin’ uh?')); 141 142 $ret = wp_update_term($tag_ID, $taxonomy, $_POST); 132 143 133 144 $location = 'edit-tags.php?taxonomy=' . $taxonomy; … … 136 147 137 148 if ( $referer = wp_get_original_referer() ) { 138 if ( false !== strpos( $referer, 'edit-tags.php') )149 if ( false !== strpos($referer, 'edit-tags.php') ) 139 150 $location = $referer; 140 151 } 141 152 142 153 if ( $ret && !is_wp_error( $ret ) ) 143 $location = add_query_arg( 'message', 3, $location);144 else 145 $location = add_query_arg( 'message', 5, $location);146 147 wp_redirect( $location);154 $location = add_query_arg('message', 3, $location); 155 else 156 $location = add_query_arg('message', 5, $location); 157 158 wp_redirect($location); 148 159 exit; 149 160 break; 150 161 151 162 default: 152 if ( ! empty($_REQUEST['_wp_http_referer']) ) { 153 $location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ); 154 155 if ( ! empty( $_REQUEST['paged'] ) ) 156 $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); 157 158 wp_redirect( $location ); 159 exit; 160 } 161 162 $wp_list_table->prepare_items(); 163 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' ); 164 165 if ( $pagenum > $total_pages && $total_pages > 0 ) { 166 wp_redirect( add_query_arg( 'paged', $total_pages ) ); 167 exit; 163 164 if ( ! empty($_GET['_wp_http_referer']) ) { 165 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); 166 exit; 168 167 } 169 168 … … 172 171 wp_enqueue_script('inline-edit-tax'); 173 172 174 if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy ) { 175 $help =''; 173 if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) { 176 174 if ( 'category' == $taxonomy ) 177 $help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>'; 178 elseif ( 'link_category' == $taxonomy ) 179 $help = '<p>' . __( 'You can create groups of links by using link categories. Link category names must be unique and link categories are separate from the categories you use for posts.' ) . '</p>'; 180 else 181 $help = '<p>' . __( 'You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '</p>'; 182 183 if ( 'link_category' == $taxonomy ) 184 $help .= '<p>' . __( 'You can delete link categories in the Bulk Action pulldown, but that action does not delete the links within the category. Instead, it moves them to the default link category.' ) . '</p>'; 185 else 186 $help .='<p>' . __( 'What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>'; 175 $help = '<p>' . sprintf(__('You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your <a href="%s">writing settings</a>.'), 'options-writing.php') . '</p>'; 176 else 177 $help = '<p>' . __('You can assign keywords to your posts using Post Tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.') . '</p>'; 178 179 $help .='<p>' . __('What’s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.') . '</p>'; 187 180 188 181 if ( 'category' == $taxonomy ) 189 $help .= '<p>' . __( 'When adding a new category on this screen, you’ll fill in the following fields:' ) . '</p>'; 190 elseif ( 'post_tag' == $taxonomy ) 191 $help .= '<p>' . __( 'When adding a new tag on this screen, you’ll fill in the following fields:' ) . '</p>'; 192 193 if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) 194 195 $help .= '<ul>' . 196 '<li>' . __( '<strong>Name</strong> - The name is how it appears on your site.' ) . '</li>'; 197 198 if ( ! global_terms_enabled() ) 199 if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) 200 $help .= '<li>' . __( '<strong>Slug</strong> - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>'; 182 $help .= '<p>' . __('When adding a new category on this screen, you’ll fill in the following fields:') . '</p>'; 183 else 184 $help .= '<p>' . __('When adding a new tag on this screen, you’ll fill in the following fields:') . '</p>'; 185 186 $help .= '<ul>' . 187 '<li>' . __('<strong>Name</strong> - The name is how it appears on your site.') . '</li>'; 188 if ( ! global_terms_enabled() ) 189 $help .= '<li>' . __('<strong>Slug</strong> - The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.') . '</li>'; 201 190 202 191 if ( 'category' == $taxonomy ) 203 $help .= '<li>' . __( '<strong>Parent</strong> - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>'; 204 205 if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) 206 $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' . 192 $help .= '<li>' . __('<strong>Parent</strong> - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.') . '</li>'; 193 194 $help .= '<li>' . __('<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.') . '</li>' . 207 195 '</ul>' . 208 '<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.') . '</p>' .209 '<p><strong>' . __( 'For more information:') . '</strong></p>';196 '<p>' . __('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.') . '</p>' . 197 '<p><strong>' . __('For more information:') . '</strong></p>'; 210 198 211 199 if ( 'category' == $taxonomy ) 212 $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Categories_SubPanel" target="_blank">Documentation on Categories</a>' ) . '</p>'; 213 elseif ( 'link_category' == $taxonomy ) 214 $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Links_Link_Categories_SubPanel" target="_blank">Documentation on Link Categories</a>' ) . '</p>'; 215 else 216 $help .= '<p>' . __( '<a href="http://codex.wordpress.org/Posts_Post_Tags_SubPanel" target="_blank">Documentation on Post Tags</a>' ) . '</p>'; 200 $help .= '<p>' . __('<a href="http://codex.wordpress.org/Manage_Categories_SubPanel" target="_blank">Categories Documentation</a>') . '</p>'; 201 else 202 $help .= '<p>' . __('<a href="http://codex.wordpress.org/Post_Tags_SubPanel" target="_blank">Tags Documentation</a>') . '</p>'; 217 203 218 204 $help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'; … … 223 209 224 210 require_once ('admin-header.php'); 225 226 if ( !current_user_can($tax->cap->edit_terms) )227 wp_die( __('You are not allowed to edit this item.') );228 211 229 212 $messages[1] = __('Item added.'); … … 239 222 <?php screen_icon(); ?> 240 223 <h2><?php echo esc_html( $title ); 241 if ( !empty($_ REQUEST['s']) )242 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_ REQUEST['s']) ) ); ?>224 if ( !empty($_GET['s']) ) 225 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?> 243 226 </h2> 244 227 245 <?php if ( isset($_ REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>228 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> 246 229 <div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div> 247 230 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); … … 252 235 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" /> 253 236 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" /> 254 255 <?php $wp_list_table->search_box( $tax->labels->search_items, 'tag' ); ?> 256 237 <p class="search-box"> 238 <label class="screen-reader-text" for="tag-search-input"><?php echo $tax->labels->search_items; ?>:</label> 239 <input type="text" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" /> 240 <input type="submit" value="<?php echo esc_attr( $tax->labels->search_items ); ?>" class="button" /> 241 </p> 257 242 </form> 258 243 <br class="clear" /> … … 262 247 <div id="col-right"> 263 248 <div class="col-wrap"> 264 <form id="posts-filter" action="" method=" post">249 <form id="posts-filter" action="" method="get"> 265 250 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" /> 266 251 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" /> 267 268 <?php $wp_list_table->display(); ?> 252 <div class="tablenav"> 253 <?php 254 $pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; 255 if ( empty($pagenum) ) 256 $pagenum = 1; 257 258 $tags_per_page = (int) get_user_option( 'edit_' . $taxonomy . '_per_page' ); 259 260 if ( empty($tags_per_page) || $tags_per_page < 1 ) 261 $tags_per_page = 20; 262 263 if ( 'post_tag' == $taxonomy ) { 264 $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page ); 265 $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter 266 } elseif ( 'category' == $taxonomy ) { 267 $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter 268 } else { 269 $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page ); 270 } 271 272 $searchterms = !empty($_GET['s']) ? trim(stripslashes($_GET['s'])) : ''; 273 274 $page_links = paginate_links( array( 275 'base' => add_query_arg( 'pagenum', '%#%' ), 276 'format' => '', 277 'prev_text' => __('«'), 278 'next_text' => __('»'), 279 'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page), 280 'current' => $pagenum 281 )); 282 283 if ( $page_links ) 284 echo "<div class='tablenav-pages'>$page_links</div>"; 285 ?> 286 287 <div class="alignleft actions"> 288 <select name="action"> 289 <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> 290 <option value="delete"><?php _e('Delete'); ?></option> 291 </select> 292 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> 293 <?php wp_nonce_field('bulk-tags'); ?> 294 </div> 295 296 <br class="clear" /> 297 </div> 298 299 <div class="clear"></div> 300 <table class="widefat tag fixed" cellspacing="0"> 301 <thead> 302 <tr> 303 <?php print_column_headers($current_screen); ?> 304 </tr> 305 </thead> 306 307 <tfoot> 308 <tr> 309 <?php print_column_headers($current_screen, false); ?> 310 </tr> 311 </tfoot> 312 313 <tbody id="the-list" class="list:tag"> 314 <?php tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy ); ?> 315 </tbody> 316 </table> 317 318 <div class="tablenav"> 319 <?php 320 if ( $page_links ) 321 echo "<div class='tablenav-pages'>$page_links</div>"; 322 ?> 323 324 <div class="alignleft actions"> 325 <select name="action2"> 326 <option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> 327 <option value="delete"><?php _e('Delete'); ?></option> 328 </select> 329 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> 330 </div> 331 332 <br class="clear" /> 333 </div> 269 334 270 335 <br class="clear" /> … … 294 359 <?php 295 360 296 if ( !is_ null( $tax->labels->popular_items) ) {361 if ( !is_taxonomy_hierarchical($taxonomy) ) { 297 362 if ( current_user_can( $tax->cap->edit_terms ) ) 298 363 $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false, 'link' => 'edit' ) ); … … 311 376 312 377 if ( current_user_can($tax->cap->edit_terms) ) { 313 // Back compat hooks. Deprecated in preference to {$taxonomy}_pre_add_form314 378 if ( 'category' == $taxonomy ) 315 do_action('add_category_form_pre', (object)array('parent' => 0) ); 316 elseif ( 'link_category' == $taxonomy ) 317 do_action('add_link_category_form_pre', (object)array('parent' => 0) ); 318 else 319 do_action('add_tag_form_pre', $taxonomy); 320 379 do_action('add_category_form_pre', (object)array('parent' => 0) ); // Back compat hook. Deprecated in preference to $taxonomy_pre_add_form 380 else 381 do_action('add_tag_form_pre', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories 321 382 do_action($taxonomy . '_pre_add_form', $taxonomy); 322 383 ?> … … 342 403 <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> 343 404 </div> 344 <?php endif; // global_terms_enabled() ?>405 <?php endif; // is_multisite() ?> 345 406 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?> 346 407 <div class="form-field"> … … 362 423 do_action('add_tag_form_fields', $taxonomy); 363 424 do_action($taxonomy . '_add_form_fields', $taxonomy); 364 365 submit_button( $tax->labels->add_new_item, 'button' ); 366 367 // Back compat hooks. Deprecated in preference to {$taxonomy}_add_form 425 ?> 426 <p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" /></p> 427 <?php 368 428 if ( 'category' == $taxonomy ) 369 do_action('edit_category_form', (object)array('parent' => 0) ); 370 elseif ( 'link_category' == $taxonomy ) 371 do_action('edit_link_category_form', (object)array('parent' => 0) ); 429 do_action('edit_category_form', (object)array('parent' => 0) ); // Back compat hook. Deprecated in preference to $taxonomy_add_form 372 430 else 373 do_action('add_tag_form', $taxonomy); 374 431 do_action('add_tag_form', $taxonomy); // Back compat hook. Applies to all Taxonomies -not- categories 375 432 do_action($taxonomy . '_add_form', $taxonomy); 376 433 ?> … … 384 441 </div><!-- /wrap --> 385 442 386 <?php $wp_list_table->inline_edit(); ?>443 <?php inline_edit_term_row('edit-tags', $taxonomy); ?> 387 444 388 445 <?php
Note:
See TracChangeset
for help on using the changeset viewer.
