Be less verbose when erroring out in do_feed() for an invalid feed template. fixes #24874.

Built from https://develop.svn.wordpress.org/trunk@25190


git-svn-id: http://core.svn.wordpress.org/trunk@25162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-08-30 23:37:11 +00:00
parent 043bb44747
commit 6a1ac52330
2 changed files with 2 additions and 4 deletions

View File

@ -1005,10 +1005,8 @@ function do_feed() {
$feed = get_default_feed();
$hook = 'do_feed_' . $feed;
if ( !has_action($hook) ) {
$message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
wp_die( $message, '', array( 'response' => 404 ) );
}
if ( ! has_action( $hook ) )
wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
do_action( $hook, $wp_query->is_comment_feed );
}