From ee2baada7b18f9700e2c350d2bce0b40b840aed6 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 30 Aug 2013 23:36:58 +0000 Subject: [PATCH] Be less verbose when erroring out in do_feed() for an invalid feed template. fixes #24874. git-svn-id: https://develop.svn.wordpress.org/trunk@25190 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 5db7e4adcf..73b9de8d5f 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -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 ); }