From 9f0db9355aee2cf2e602fedc2e0e33880d745881 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 1 Mar 2010 20:33:03 +0000 Subject: [PATCH] Die if invalid post type is passed. see #9674 git-svn-id: http://svn.automattic.com/wordpress/trunk@13537 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit.php | 6 ++++-- wp-admin/post-new.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 7ddb23680..9450f9c1d 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -20,10 +20,12 @@ if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['pag unset( $_redirect ); } -if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) ) +if ( !isset($_GET['post_type']) ) + $post_type = 'post'; +elseif ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) $post_type = $_GET['post_type']; else - $post_type = 'post'; + wp_die( __('Invalid post type') ); $_GET['post_type'] = $post_type; $post_type_object = get_post_type_object($post_type); diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php index 62d74563f..ef9f7600a 100644 --- a/wp-admin/post-new.php +++ b/wp-admin/post-new.php @@ -9,10 +9,12 @@ /** Load WordPress Administration Bootstrap */ require_once('admin.php'); -if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) ) +if ( !isset($_GET['post_type']) ) + $post_type = 'post'; +elseif ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) ) $post_type = $_GET['post_type']; else - $post_type = 'post'; + wp_die( __('Invalid post type') ); if ( 'post' != $post_type ) { $parent_file = "edit.php?post_type=$post_type";