Changeset 15308

Timestamp:

06/23/2010 07:30:53 AM (13 years ago)

Author:

nacin

Message:

Avoid variable clash in export.php. see #14026 for 3.0.

File:

• branches/3.0/wp-admin/export.php (modified) (4 diffs)

branches/3.0/wp-admin/export.php

@@ -29 +29 @@
         $taxonomy = array();
         foreach ( get_taxonomies( array( 'show_ui' => true ) ) as $tax )
-            $taxonomy[ $tax ] = ! empty( $_GET['taxonomy'][ $tax ] ) ? $_GET['taxonomy'][ $tax ] : 'all';
-        $post_type = isset($_GET['post_type']) ? stripslashes_deep($_GET['post_type']) : 'all';
-        $status = isset($_GET['status']) ? stripslashes_deep($_GET['status']) : 'all';
+            $taxonomy[ $tax ] = ! empty( $_GET['export_taxonomy'][ $tax ] ) ? $_GET['export_taxonomy'][ $tax ] : 'all';
+        $post_type = isset($_GET['export_post_type']) ? stripslashes_deep($_GET['export_post_type']) : 'all';
+        $status = isset($_GET['export_post_status']) ? stripslashes_deep($_GET['export_post_status']) : 'all';
         $mm_start = isset($_GET['mm_start']) ? $_GET['mm_start'] : 'all';
         $mm_end = isset($_GET['mm_end']) ? $_GET['mm_end'] : 'all';
@@ -109 +109 @@
 </tr>
 <?php foreach ( get_taxonomies( array( 'show_ui' => true ), 'objects' ) as $tax_obj ) {
-    $term_dropdown = wp_dropdown_categories( array( 'taxonomy' => $tax_obj->name, 'hide_if_empty' => true, 'show_option_all' => __( 'All Terms' ), 'name' => 'taxonomy[' . $tax_obj->name . ']', 'id' => 'taxonomy-' . $tax_obj->name, 'class' => '', 'echo' => false ) );
+    $term_dropdown = wp_dropdown_categories( array( 'taxonomy' => $tax_obj->name, 'hide_if_empty' => true, 'show_option_all' => __( 'All Terms' ), 'name' => 'export_taxonomy[' . $tax_obj->name . ']', 'id' => 'taxonomy-' . $tax_obj->name, 'class' => '', 'echo' => false ) );
     if ( $term_dropdown )
         echo '<tr><th><label for="taxonomy-' . $tax_obj->name . '">' . $tax_obj->labels->name . '</label></th><td>' . $term_dropdown . '</td></tr>';
@@ -117 +117 @@
 <th><label for="post_type"><?php _e('Content Types'); ?></label></th>
 <td>
-<select name="post_type" id="post_type">
+<select name="export_post_type" id="post_type">
     <option value="all" selected="selected"><?php _e('All Content'); ?></option>
     <?php foreach ( get_post_types( array( 'public' => true, 'can_export' => true ), 'objects' ) as $post_type_obj ) { ?>
@@ -128 +128 @@
 <th><label for="status"><?php _e('Statuses'); ?></label></th>
 <td>
-<select name="status" id="status">
+<select name="export_post_status" id="status">
     <option value="all" selected="selected"><?php _e('All Statuses'); ?></option>
 <?php foreach ( get_post_stati( array( 'internal' => false ), 'objects' ) as $post_status_obj ) { ?>